rallytime 8d1e1e7f94 Merge branch '2017.7' into '2018.3' ... Conflicts: - .kitchen.yml - Gemfile - pkg/windows/build_env_2.ps1 - pkg/windows/build_env_3.ps1 - pkg/windows/req.txt - salt/client/ssh/__init__.py - salt/client/ssh/ssh_py_shim.py - salt/modules/boto_vpc.py - salt/modules/file.py - salt/modules/heat.py - salt/modules/smartos_vmadm.py - salt/modules/win_dsc.py - salt/returners/elasticsearch_return.py - salt/runners/salt.py - salt/states/module.py - salt/utils/win_functions.py - setup.py - tests/integration/modules/test_state.py - tests/unit/grains/test_core.py - tests/unit/test_pillar.py		2018-03-15 17:22:05 -04:00
..
base.txt	Don't install msgpack 0.5.5	2018-03-02 13:39:33 -05:00
dev_python27.txt	Merge branch '2017.7' into '2018.3'	2018-03-15 17:22:05 -04:00
dev_python34.txt	Merge branch '2017.7' into '2018.3'	2018-03-15 17:22:05 -04:00
opt.txt	nacl updates	2017-07-24 10:11:32 -04:00
pytest.txt	pytest-catchlog is also required for pytest-salt	2017-03-09 19:31:14 +00: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