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
..
CODEOWNERS	Add *pkg* and *snapper* to team-suse	2018-02-28 09:58:46 -05:00
CONTRIBUTING.md	Change .rst syntax to .md syntax	2017-03-13 17:14:50 -06:00
ISSUE_TEMPLATE.md	Tweak the pull request and issue templates	2016-03-22 11:32:07 -06:00
PULL_REQUEST_TEMPLATE.md	Typo fix	2017-10-16 13:00:11 -06:00
stale.yml	Reduce the number of days an issue is stale by 15	2017-12-01 15:09:14 -05:00