Ch3LL 63962b547a Merge branch '2018.3' into '2019.2' ... Conflicts: - salt/states/linux_acl.py - salt/transport/ipc.py		2019-03-28 11:10:45 -04:00
..
static	Let's not include raet by default	2019-03-21 19:26:48 +00:00
base.txt	Lock PyYAML to < 5.1	2019-03-15 16:45:54 +00: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	Move all of PyTest requirements to its own requiremnts file	2019-01-19 18:38:44 +00: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	Switch required PyTest dependency	2019-01-30 11:49:17 +00:00
raet.txt	Fix spacing	2016-08-16 13:16:59 -07:00
tests.txt	Actually, remove python-ldap. It needs system deps. Have salt-jenkins do it.	2019-02-01 16:37:14 +00:00
zeromq.txt	handle pyzmq for python3.4	2018-07-18 12:16:05 -05:00