rallytime 3d2ea16c3a Merge branch '2017.7' into '2018.3' ... Conflicts: - requirements/base.txt - salt/states/archive.py - salt/states/file.py - tests/integration/runners/test_state.py - tests/unit/daemons/test_masterapi.py		2018-06-11 11:45:37 -04:00
..
base.txt	add tests.txt for running tests with tox requirements	2018-06-05 18:55:04 -05: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	Allow running pytest>=3.5.0	2018-04-27 23:38:08 +03: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