11 Commits

Author	SHA1	Message	Date
Thomas S Hatch	a5c8ae09a3	Clean up mess from bad merge	2014-06-30 15:14:14 -06:00
Thomas S Hatch	1cd95aa0c8	Revert "Sign the masters pub-key"	2014-06-30 15:04:53 -06:00
vs	cfa163d4fb	Merge remote-tracking branch 'upstream/develop' into sign_master_keys	2014-06-27 03:52:30 -07:00
Jesse Collier	5f67e13465	Fixing bug that prevents correct status with upstart	2014-06-25 12:47:22 -07:00
vs	f54b90b07c	pylinting, better log messages, docstrings, no logic changes	2014-06-25 06:26:01 -07:00
Corey Quinn	9e402e6280	Updating packaging files for salt-ssh and upstart/logrotate	2013-11-16 17:09:23 -08:00
Sean Channel	51895d6b1b	remove upstart files	2012-11-21 14:16:59 -08:00
Sean Channel	4f828f68d8	stop respawning	2012-10-04 14:22:12 -07:00
Ulrich Dangel	f7de4b74f4	Simplify upstart definitions ... * Remove unecessary script stanzas * Remove explicit interpreter * Run salt-master in the foreground	2012-08-07 06:39:06 +02:00
Ulrich Dangel	218a0bd35d	Change upstart definition to respawn minions as well as syndic and limit master respawning.	2012-08-07 06:37:58 +02:00
Corey Quinn	9ff9aa455c	Upstart files for ubuntu packages	2012-06-11 16:50:05 -07:00