rallytime 73d73e80c1 Merge branch '2016.3' into 'develop' ... Conflicts: - doc/topics/releases/2015.8.4.rst - doc/topics/releases/2015.8.5.rst - doc/topics/thorium/index.rst - salt/cloud/clouds/opennebula.py - salt/engines/thorium.py - salt/loader.py - salt/modules/archive.py - salt/modules/boto_vpc.py - salt/modules/data.py - salt/modules/reg.py - salt/pillar/mysql.py - salt/runners/cache.py - salt/states/archive.py - salt/states/cron.py - salt/states/file.py - salt/states/glance.py - salt/states/reg.py - salt/thorium/__init__.py - salt/thorium/check.py - salt/thorium/file.py - salt/thorium/reg.py - salt/utils/jid.py - salt/utils/parsers.py - setup.py		2016-02-12 14:38: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	Change 2015 to 2016 in license file	2016-02-05 09:37:46 -07: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	fix build on smartos #30968	2016-02-07 21:41:43 -07:00
solaris	Added placeholder release notes for 2015.5.10	2016-01-22 10:48:08 -07:00
suse	Merge branch '2016.3' into 'develop'	2016-02-12 14:38:50 -07:00
windows	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3	2016-02-11 22:33:49 -07: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 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: improve (module|runner).function name retrieval	2016-02-09 14:12:25 -05:00