rallytime 8fed338708 Merge branch '2018.3' into 'fluorine' ... Conflicts: - salt/spm/pkgfiles/local.py - salt/utils/schedule.py - tests/integration/scheduler/test_eval.py		2018-10-25 10:31:06 -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	Ignore testinfra 1.17.0	2018-10-24 11:38:24 -04:00
opt.txt	Pin CherryPy version to < 18.0.0 in requirements files for PY2	2018-09-04 10:51:12 -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	Merge branch '2018.3' into 'fluorine'	2018-09-06 12:20:52 -04:00
zeromq.txt	handle pyzmq for python3.4	2018-07-18 12:16:05 -05:00