rallytime fa5e17b342 Merge branch '2015.8' into '2016.3' ... Conflicts: - salt/modules/win_service.py - salt/modules/zypper.py - salt/states/pkgrepo.py		2016-03-30 15:33:13 -06: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
fish-completions	Remove trailing white spaces in files under pkg/ dir	2016-03-01 17:37:18 +02:00
freeze	PEP8 for packaging	2012-06-30 14:35:31 -06:00
macports/ports/sysutils/salt	Remove trailing white spaces in files under pkg/ dir	2016-03-01 17:37:18 +02:00
openbsd	Correcting exec for salt-minion on OpenBSD	2013-04-01 20:54:28 -05:00
osx	Add /opt/salt/bin to PATH	2016-03-25 16:14:40 -06:00
rpm	Merge branch '2015.8' into '2016.3'	2016-03-02 10:26:13 -07:00
shar	Remove trailing white spaces in files under pkg/ dir	2016-03-01 17:37:18 +02:00
smartos	drop M2Crypto from the SmartOS esky builds	2016-03-05 23:43:18 +00:00
solaris	Added placeholder release notes for 2015.5.10	2016-01-22 10:48:08 -07:00
suse	Merge branch '2015.8' into '2016.3'	2016-03-25 11:47:16 -06:00
windows	Merge branch '2015.8' into '2016.3'	2016-03-30 15:33:13 -06:00
salt-api.service	Force-kill websocket's child processes faster than default two minutes.	2016-02-11 15:16:43 +01: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	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-12-08 12:23:26 -07: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	Drop obsolete syslog.target from systemd services	2015-12-08 13:48:34 +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-syndic.service	Drop obsolete syslog.target from systemd services	2015-12-08 13:48:34 +01: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	Remove trailing white spaces in files under pkg/ dir	2016-03-01 17:37:18 +02: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: improved cache validation	2015-11-22 00:30:58 -05:00