rallytime 398cc78224 Merge branch '2017.7' into '2018.3' ... Conflicts: - .kitchen.yml - doc/topics/releases/2017.7.6.rst - salt/modules/timezone.py - tests/support/case.py - tests/unit/modules/test_timezone.py		2018-06-15 16:51:45 -04:00
..
base.txt	Merge branch '2017.7.6' into '2017.7'	2018-06-13 15:04:55 -04:00
dev_python27.txt	make dev_python27.txt have the same message as dev_python34.txt	2018-05-15 12:29:52 -05:00
dev_python34.txt	simplify dev and base.txt to single files	2018-05-13 08:38:34 -04:00
dev.txt	Merge branch '2017.7' into '2018.3'	2018-06-11 11:45:37 -04:00
opt.txt	nacl updates	2017-07-24 10:11:32 -04:00
pytest.txt	add pytest coverage and xml junits	2018-06-07 12:53:22 -05:00
raet.txt	Fix spacing	2016-08-16 13:16:59 -07:00
tests.txt	simplify tox.ini	2018-06-05 20:41:52 -05:00
zeromq.txt	Fix spacing	2016-08-16 13:16:59 -07:00