Ch3LL 547889b375 Merge branch '2017.7' into '2018.3' ... Conflicts: - pkg/windows/build_env_2.ps1 - pkg/windows/req.txt - salt/_compat.py - salt/engines/slack.py - salt/modules/dockermod.py - salt/modules/git.py - salt/modules/heat.py - salt/modules/incron.py - salt/modules/lxc.py - salt/modules/memcached.py - salt/modules/network.py - salt/modules/nspawn.py - salt/modules/saltutil.py - salt/modules/win_network.py - salt/modules/yumpkg.py - salt/serializers/yaml.py - salt/states/heat.py - salt/states/module.py - salt/states/rabbitmq_policy.py - salt/states/virtualenv_mod.py - salt/states/win_system.py - salt/utils/master.py - tests/integration/cli/test_batch.py - tests/support/case.py		2019-02-15 14:38:26 -05: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	Fix service name in minion plist	2019-01-15 15:35:18 -06:00
deb	restart salt-syndic when salt-master restart	2018-06-08 22:13:51 +08: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	Correcting exec for salt-minion on OpenBSD	2013-04-01 20:54:28 -05:00
osx	Update url to libsodium for mac builds	2019-02-07 12:52:44 -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	Align SUSE salt-master.service 'LimitNOFILES' limit with upstream Salt	2018-05-31 11:02:18 +01:00
windows	Allow NOT to install pip dependencies	2019-02-13 12:04:56 +00:00
salt-api.service	Add documentation key to systemd service files	2017-05-24 11:14:39 +02:00
salt-api.upstart	add upstart	2013-04-10 08:42:26 -07:00
salt-common.logrotate	remove wildcard stanza	2012-11-29 16:31:53 -08:00
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	restart salt-syndic when salt-master restart	2018-06-08 22:13:51 +08: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	do not force rm of conf files	2013-02-09 14:03:01 -08:00
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