42673 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Pedro Algarvio	95ef828346	Merge branch 'develop' of github.com:saltstack/salt into develop	2014-11-27 03:57:49 +00:00
Thomas S Hatch	99b76a1782	Merge pull request #18537 from garethgreenaway/scheduler_run_on_start ... Additions to scheduler.	2014-11-26 18:42:55 -07:00
Thomas S Hatch	082c82309d	Merge pull request #18529 from thatch45/event_cleaning ... use event factory functions	2014-11-26 18:39:26 -07:00
Seth House	75ef72b7fb	Merge pull request #18523 from saltstack/revert-18148-six_docs_build ... Revert "[don't merge!!] Add six dependency notice to building docs intru...	2014-11-26 16:19:42 -07:00
Seth House	4ee5fcbcca	Merge pull request #18536 from tjyang/develop ... Adding 4 smallerpdf files beside one giant 1600+ pages Salt-all.pdf	2014-11-26 16:14:23 -07:00
Gareth J. Greenaway	75ed48bc6e	Adding the ability to not have a scheduled job run when the minion first starts up.	2014-11-26 14:56:37 -08:00
T.J. Yang	a6535cf37d	makefile update at Wed Nov 26 16:21:18 CST 2014	2014-11-26 16:21:18 -06:00
Pedro Algarvio	bd7f23ac6f	Switch open() for salt.utils.fopen()	2014-11-26 20:30:13 +00:00
Pedro Algarvio	1c65fa2db4	Switch open() for salt.utils.fopen()	2014-11-26 20:27:51 +00:00
Pedro Algarvio	89778fd9dd	Switch open() for salt.utils.fopen()	2014-11-26 20:26:44 +00:00
Pedro Algarvio	643d66070a	Switch open() for salt.utils.fopen()	2014-11-26 20:25:40 +00:00
Pedro Algarvio	acd615d486	Switch open() for salt.utils.fopen()	2014-11-26 20:24:40 +00:00
Pedro Algarvio	1ec10692de	Switch open() for salt.utils.fopen()	2014-11-26 20:23:59 +00:00
Pedro Algarvio	316c1ad80b	Switch open() for salt.utils.fopen()	2014-11-26 20:23:16 +00:00
Pedro Algarvio	a32818870c	Switch open() for salt.utils.fopen()	2014-11-26 20:22:38 +00:00
Pedro Algarvio	7fcd8af68c	Switch open() for salt.utils.fopen()	2014-11-26 20:21:41 +00:00
Pedro Algarvio	c72a0a9dff	Dos 2 unix line breaks. Switch open() for salt.utils.fopen()	2014-11-26 20:20:47 +00:00
Thomas S Hatch	8db80b774e	use event factory functions	2014-11-26 13:16:17 -07:00
Pedro Algarvio	bfe99dbb3f	Merge branch '2014.7' into develop ... Conflicts: salt/cloud/__init__.py salt/modules/file.py salt/modules/zcbuildout.py salt/runners/lxc.py salt/runners/manage.py	2014-11-26 20:14:56 +00:00
Pedro Algarvio	491d251f48	Fix invalid syntax	2014-11-26 19:57:32 +00:00
Pedro Algarvio	d3f419ca84	Fix undefined variable	2014-11-26 19:56:24 +00:00
Pedro Algarvio	edb1687d19	Switch open() for salt.utils.fopen()	2014-11-26 19:34:55 +00:00
Pedro Algarvio	71bc0b754e	Switch open() for salt.utils.fopen()	2014-11-26 19:32:45 +00:00
Nicole Thomas	e1157d13be	Revert "[don't merge!!] Add six dependency notice to building docs intructions"	2014-11-26 12:23:13 -07:00
Pedro Algarvio	10124b55f8	Switch open() for salt.utils.fopen()	2014-11-26 19:22:51 +00:00
Pedro Algarvio	c7a6b59bbb	Switch open() for salt.utils.fopen()	2014-11-26 19:21:43 +00:00
Pedro Algarvio	0c5b32f3ac	Switch open() for salt.utils.fopen()	2014-11-26 19:20:57 +00:00
Pedro Algarvio	fad1b1c67f	Switch open() for salt.utils.fopen()	2014-11-26 19:19:04 +00:00
Pedro Algarvio	6aa234008b	Switch open() for salt.utils.fopen()	2014-11-26 19:18:30 +00:00
Pedro Algarvio	d523a089af	Switch open() for salt.utils.fopen()	2014-11-26 19:17:33 +00:00
Pedro Algarvio	b2e0c9905d	Switch open() for salt.utils.fopen()	2014-11-26 19:16:58 +00:00
Pedro Algarvio	405e564785	Switch open() for salt.utils.fopen()	2014-11-26 19:16:08 +00:00
Pedro Algarvio	6ba41c9181	Switch open() for salt.utils.fopen()	2014-11-26 19:13:11 +00:00
Pedro Algarvio	1d5e2833fe	Switch open() for salt.utils.fopen()	2014-11-26 19:09:00 +00:00
Pedro Algarvio	68e9b21895	Switch open() for salt.utils.fopen()	2014-11-26 19:03:27 +00:00
Thomas S Hatch	96b35c5548	Merge pull request #18521 from thatch45/gate_zmq ... gate zmq!	2014-11-26 11:56:16 -07:00
Thomas S Hatch	7b2c620414	gate zmq!	2014-11-26 11:55:38 -07:00
Pedro Algarvio	0f53576aa9	Switch open() for salt.utils.fopen()	2014-11-26 18:53:55 +00:00
Pedro Algarvio	4db7003978	Switch open() for salt.utils.fopen()	2014-11-26 18:53:20 +00:00
Pedro Algarvio	f7d9c81789	Switch open() for salt.utils.fopen()	2014-11-26 18:52:54 +00:00
Pedro Algarvio	d447ceadef	Switch open() for salt.utils.fopen()	2014-11-26 18:51:55 +00:00
Pedro Algarvio	8b4539d9a1	Switch open() for salt.utils.fopen()	2014-11-26 18:50:07 +00:00
Pedro Algarvio	4930516e5e	Switch open() for salt.utils.fopen()	2014-11-26 18:49:43 +00:00
Pedro Algarvio	dd92b094af	Switch open() for salt.utils.fopen()	2014-11-26 18:49:13 +00:00
Pedro Algarvio	730fd6dfe9	Switch open() for salt.utils.fopen()	2014-11-26 18:45:15 +00:00
Pedro Algarvio	9c2bb1ce28	Switch open() for salt.utils.fopen()	2014-11-26 18:43:38 +00:00
Pedro Algarvio	24f9c8f8d9	Switch open() for salt.utils.fopen()	2014-11-26 18:42:59 +00:00
Pedro Algarvio	33066c56fd	Switch open() for salt.utils.fopen()	2014-11-26 18:42:35 +00:00
Pedro Algarvio	7870adf08c	Switch open() for salt.utils.fopen()	2014-11-26 18:36:35 +00:00
Pedro Algarvio	8771d1a922	Switch open() for salt.utils.fopen()	2014-11-26 18:36:10 +00:00