Colton Myers cb8bf91944 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: doc/ref/configuration/master.rst doc/topics/cloud/linode.rst salt/cloud/clouds/linode.py salt/modules/rh_ip.py salt/renderers/pyobjects.py salt/states/file.py		2016-01-21 17:42:50 -07:00
..
arch	Merged salt-api into Salt	2014-06-18 22:13:56 -06:00
darwin	Add /usr/local/bin to $PATH in salt-minion plist	2015-08-17 22:41:25 -04:00
fish-completions	[fish shell completion] updated comments	2015-01-08 15:30:29 +03:00
freeze	PEP8 for packaging	2012-06-30 14:35:31 -06:00
macports/ports/sysutils/salt	Update Macports Portfile	2015-02-05 07:22:54 +01:00
openbsd	Correcting exec for salt-minion on OpenBSD	2013-04-01 20:54:28 -05:00
osx	BUG: fix osx .pkg script locations to match the .plist files.	2016-01-19 09:37:20 -08:00
rpm	Use print as a function [PEP 3105].	2015-12-04 16:17:35 -08:00
shar	Add additional information to the comments for the shar script	2014-06-23 16:00:19 -05:00
smartos	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-09-01 15:15:13 -06:00
solaris	pkg/solaris : fix typo on salt-master's manifest	2013-05-11 15:24:32 +02:00
suse	Merge branch '2015.8' into develop	2015-11-04 15:40:03 -07:00
windows	Use print as a function [PEP 3105].	2015-12-04 16:17:35 -08:00
salt-api.service	Drop obsolete syslog.target from systemd services	2015-12-08 13:48:34 +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 remaining exsel code	2014-05-29 01:32:54 +01:00
salt.postrm	do not force rm of conf files	2013-02-09 14:03:01 -08:00
salt.ufw	install bash completion and UFW firewall config	2012-12-03 23:36:33 -08:00
zsh_completion.zsh	zsh-completion: improved cache validation	2015-11-22 00:30:58 -05:00