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
..
alpine	Add OpenRC init scripts for bootstrapping Alpine Linux from Git	2017-04-10 11:52:56 +03:00
arch	Remove trailing white spaces in files under pkg/ dir	2016-03-01 17:37:18 +02:00
darwin	Add /usr/local/bin to $PATH in salt-minion plist	2015-08-17 22:41:25 -04:00
deb	use KillMode=process for salt-minion.service	2018-01-03 14:38:23 -05:00
fish-completions	Remove trailing white spaces in files under pkg/ dir	2016-03-01 17:37:18 +02:00
freeze
macports/ports/sysutils/salt	upgrade macports salt to v2016.11	2016-10-22 11:04:50 -05:00
openbsd
osx	Remove check for sudo	2017-12-07 17:31:31 -07:00
rpm	add -n with netstat so we don't resolve	2017-10-03 13:32:30 -04:00
shar	Remove trailing white spaces in files under pkg/ dir	2016-03-01 17:37:18 +02:00
smartos	Fix ZMQ cython .so files linkage	2017-03-22 22:03:53 +01:00
solaris	Added placeholder release notes for 2015.5.10	2016-01-22 10:48:08 -07:00
suse	Merge branch '2017.7' into '2018.3'	2018-03-15 17:22:05 -04:00
windows	Merge branch '2017.7' into '2018.3'	2018-03-15 17:22:05 -04:00
salt-api.service	Add documentation key to systemd service files	2017-05-24 11:14:39 +02:00
salt-api.upstart
salt-common.logrotate
salt-master.service	Raise LimitNOFILE to default max open files	2018-01-25 16:17:48 +01:00
salt-master.upstart	remove problematic expect fork	2014-09-18 10:40:05 -06:00
salt-master.upstart.rhel6	Remove "su -c" from upstart scripts	2014-03-25 16:10:08 -06:00
salt-minion.service	use KillMode=process for salt-minion.service	2018-01-03 14:38:23 -05:00
salt-minion.sleep	Add salt-minion.sleep	2017-01-31 22:04:04 +01:00
salt-minion.upstart	Remove "su -c" from upstart scripts	2014-03-25 16:10:08 -06:00
salt-minion.upstart.rhel6	Remove "su -c" from upstart scripts	2014-03-25 16:10:08 -06:00
salt-proxy@.service	Merge branch 'nitrogen' into 'develop'	2017-05-26 11:27:24 -06:00
salt-syndic.service	Add documentation key to systemd service files	2017-05-24 11:14:39 +02:00
salt-syndic.upstart	Remove "su -c" from upstart scripts	2014-03-25 16:10:08 -06:00
salt-syndic.upstart.rhel6	Remove "su -c" from upstart scripts	2014-03-25 16:10:08 -06:00
salt.bash	Merge branch '2017.7' into 'develop'	2017-09-22 10:24:04 -04:00
salt.postrm
salt.ufw	Remove trailing white spaces in files under pkg/ dir	2016-03-01 17:37:18 +02:00
zsh_completion.zsh	zsh-completion: improve (module|runner).function name retrieval	2016-02-09 14:12:25 -05:00