salt/requirements
rallytime 786076ac03
Merge branch '2017.7' into '2018.3'
Conflicts:
  - pkg/windows/modules/get-settings.psm1
  - salt/modules/cmdmod.py
  - salt/modules/pip.py
  - salt/modules/win_lgpo.py
  - salt/states/pip_state.py
  - tests/integration/states/test_pip.py
  - tests/support/helpers.py
  - tests/unit/modules/test_pip.py
  - tests/whitelist.txt
2018-05-07 13:17:01 -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 Don't install msgpack 0.5.5 2018-03-02 13:39:33 -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