rallytime dd3e6f3f0a Merge branch '2017.7' into '2018.3' ... Conflicts: - doc/man/salt-api.1 - doc/man/salt-call.1 - doc/man/salt-cloud.1 - doc/man/salt-cp.1 - doc/man/salt-key.1 - doc/man/salt-master.1 - doc/man/salt-minion.1 - doc/man/salt-proxy.1 - doc/man/salt-run.1 - doc/man/salt-ssh.1 - doc/man/salt-syndic.1 - doc/man/salt-unity.1 - doc/man/salt.1 - doc/man/salt.7 - doc/man/spm.1 - salt/states/pkgrepo.py		2018-05-15 12:29:29 -04:00
..
base-py2.txt	Add missing requirements files not commited in #47106	2018-05-02 18:34:09 +01:00
base-py3.txt	Add missing requirements files not commited in #47106	2018-05-02 18:34:09 +01:00
base.txt	Update dependency to msgpack	2018-05-09 12:47:07 -05:00
dev_python27.txt	Allow running pytest>=3.5.0	2018-04-27 23:38:08 +03:00
dev_python34.txt	Allow running pytest>=3.5.0	2018-04-27 23:38:08 +03: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
zeromq.txt	Fix spacing	2016-08-16 13:16:59 -07:00