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
..
config.rst	Update correct default value for spm_build_dir	2016-06-27 13:11:23 +02:00
dev.rst	Update all references for moved functions to use "files" util	2017-07-18 10:31:01 -06:00
index.rst	updated spm docs	2015-12-28 14:29:02 -07:00
master.rst	fix docstring errors during rendering	2017-11-07 10:24:56 +02:00
packaging.rst	updated spm docs	2015-12-28 14:29:02 -07:00
repo.rst	updated spm docs	2015-12-28 14:29:02 -07:00
spm_formula.rst	Merge branch '2017.7' into '2018.3'	2018-03-15 17:22:05 -04:00