rallytime e0ae50e489 Merge branch '2017.7' into 'develop' ... Conflicts: - pkg/salt.bash - salt/client/mixins.py - salt/minion.py - salt/modules/aptpkg.py - salt/modules/boto_vpc.py - salt/modules/win_pkg.py - salt/utils/reactor.py - tests/unit/utils/test_reactor.py		2017-09-22 10:24:04 -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 the escaped name (%i) in the proxy description	2017-05-26 09:45:54 +00: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	Fix logic in /etc/paths.d/salt detection	2017-09-15 13:41:23 -06:00
rpm	Merge branch 'nitrogen' into 'develop'	2017-06-13 15:01:51 -06: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	Enables salt-minion watchdog on init.d script for sysV	2017-06-20 17:28:40 +01:00
windows	Change all comment markers to '#'	2017-09-12 12:59:57 -06: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	Add documentation key to systemd service files	2017-05-24 11:14:39 +02:00
salt-master.upstart	remove problematic expect fork	2014-09-18 10:40:05 -06:00
salt-master.upstart.rhel6
salt-minion.service	Merge branch '2016.11' into 'nitrogen'	2017-05-24 16:32:59 -06:00
salt-minion.sleep	Add salt-minion.sleep	2017-01-31 22:04:04 +01:00
salt-minion.upstart
salt-minion.upstart.rhel6
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
salt-syndic.upstart.rhel6
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