39072 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Thomas S Hatch	333c477071	minor lint fixes	2014-10-30 10:06:04 -06:00
Thomas S Hatch	1e8aa4a266	Merge branch 'vpc_describe' of https://github.com/bemehow/salt into bemehow-vpc_describe	2014-10-30 10:04:59 -06:00
Thomas S Hatch	3f58d716a2	Merge pull request #16878 from plastikos/improvement-filter_by ... Improve filter_by() base argument:	2014-10-30 10:02:32 -06:00
Thomas S Hatch	c69e2c7305	Merge pull request #16861 from cachedout/issue_11631 ... Route minion module failures through the event system	2014-10-30 09:58:11 -06:00
Thomas S Hatch	4b7b163de1	Merge pull request #16832 from syphernl/fix/tomcat_wardeploy ... Tomcat module: Fixed deploy_war not working and added version retrieval	2014-10-30 09:56:47 -06:00
Mike Place	cf246a3b4a	Merge pull request #17026 from dmyerscough/drac ... DRAC State	2014-10-30 09:54:21 -06:00
Gareth J. Greenaway	ff15c28e48	Adding some CLI examples	2014-10-30 08:50:20 -07:00
Mike Place	4dcfc6119a	Merge pull request #17023 from jacksontj/develop ... Refactor of zk_concurrency into state/module pair.	2014-10-30 09:19:16 -06:00
Damian Myerscough	47769bc445	Correct small typo	2014-10-30 08:10:25 -07:00
Thomas Jackson	06d9164957	Pylint fixes	2014-10-30 07:38:47 -07:00
Joseph Hall	248e3e8470	Merge pull request #17025 from crevetor/develop ... Add a projectid configuration for cloudstack provider.	2014-10-30 06:02:31 -06:00
Joseph Hall	3b098ec8f8	Merge pull request #16974 from s0undt3ch/hotfix/16945-sftp-opts ... Make sure `kwargs=None` is properly handled. Fixes #16945.	2014-10-30 06:00:14 -06:00
Joseph Hall	ada851aaa4	Merge pull request #17020 from s0undt3ch/hotfix/bootstrap-script ... Update to latest stable release of the bootstrap script, v2014.10.30	2014-10-30 05:59:36 -06:00
Joseph Hall	10f908eafc	Merge pull request #17028 from hvnsweeting/develop ... use 2 spaces only	2014-10-30 05:59:05 -06:00
Pedro Algarvio	17564057c9	Actually kill the tests sshd process. Provide a custom know_hosts file to use.	2014-10-30 06:45:52 +00:00
Gareth J. Greenaway	f47ab132ca	Adding some functions for management of the Postfix mail queue	2014-10-29 22:34:00 -07:00
Hung Nguyen Viet	7423369c55	use 2 spaces only	2014-10-30 11:53:18 +07:00
Mike Place	a07978183a	Factor eauth checks into single func	2014-10-29 22:00:59 -06:00
Damian Myerscough	f863a369db	Allow a dictionary of usernames	2014-10-29 20:58:45 -07:00
Antoine Reversat	244ee45577	Conform to pep8	2014-10-29 23:57:32 -04:00
Mike Place	264e2507f2	Refactor token processing in wheel/runner	2014-10-29 21:33:39 -06:00
Antoine Reversat	e29449a896	Add a projectid configuration. Allows specifying in what project to create the VM	2014-10-29 23:05:43 -04:00
Mike Place	aa68d6f8da	Merge branch 'develop' of https://github.com/saltstack/salt into develop	2014-10-29 20:43:38 -06:00
Mike Place	696862fa99	Lint	2014-10-29 20:43:16 -06:00
Thomas Jackson	4a01d42403	Add lock_holders function to see who holds the locks	2014-10-29 19:33:29 -07:00
Thomas Jackson	d93abbe595	Re-order some args	2014-10-29 19:21:42 -07:00
Thomas Jackson	f34344b25f	Refactor of zk_concurrency into state/module pair.	2014-10-29 19:10:13 -07:00
Pedro Algarvio	b4b064dab2	Remove the "unknown" fallback	2014-10-30 01:32:22 +00:00
Pedro Algarvio	77e7167fb0	Update to latest stable release of the bootstrap script, v2014.10.30 ... * Apply the forking patch to openSUSE git installations.	2014-10-30 01:26:54 +00:00
Mike Place	6474d56bbe	Info log messages on component startup	2014-10-29 19:11:43 -06:00
Seth House	53dae1b3e4	Merge pull request #17019 from whiteinge/doc-salt-api-2014.7-release-notes ... Added the salt-api merge and recent additions to 2014.7 release notes	2014-10-29 18:16:16 -05:00
Seth House	36ca21de0c	Added the salt-api merge and recent additions to 2014.7 release notes	2014-10-29 18:15:03 -05:00
Mike Place	c2e96e93a5	Re-civilize maintenance functions	2014-10-29 16:41:58 -06:00
Nicole Thomas	3ea6399216	Merge pull request #17016 from rallytime/pylint ... Pylint fix	2014-10-29 16:28:03 -06:00
rallytime	71bc658f3c	Pylint fix	2014-10-29 16:27:21 -06:00
Nicole Thomas	500afb29fe	Merge pull request #16962 from jacksontj/2014.7 ... 2014.7	2014-10-29 16:19:03 -06:00
Colton Myers	91341d8d1e	Merge pull request #17015 from basepi/removevirtuallog16748 ... Don't log in __virtual__	2014-10-29 16:16:53 -06:00
Colton Myers	a9ac017cdf	Don't log in __virtual__	2014-10-29 16:16:19 -06:00
Colton Myers	bcdad4c9cf	Merge branch '2014.7' into develop	2014-10-29 16:15:42 -06:00
Nicole Thomas	549ef0066c	Merge pull request #17008 from terminalmage/issue16926 ... Fix check_cmd behavior for file.managed state	2014-10-29 16:13:09 -06:00
Mike Place	c409299e96	Merge branch 'master_maint' into maint_develop ... Conflicts: salt/master.py	2014-10-29 16:12:52 -06:00
Mike Place	0f39dcdccb	Merge branch 'develop' of https://github.com/saltstack/salt into develop	2014-10-29 16:11:35 -06:00
Mike Place	d227f57c6c	Refactor master to a new Maintenance class	2014-10-29 16:11:08 -06:00
Seth House	aff7ab3f43	Merge remote-tracking branch 'upstream/2014.7' into develop	2014-10-29 16:47:23 -05:00
Erik Johnson	b6465332a0	Merge pull request #17013 from whiteinge/doc-rest_cherrypy-key ... Added missing docs for the /key rest_cherrypy entry point	2014-10-29 15:39:10 -06:00
Thomas Jackson	52f7216bea	Revert naming here too	2014-10-29 14:35:27 -07:00
Seth House	9da07584e4	Added missing docs for the /key rest_cherrypy entry point ... Should have been part of #16706.	2014-10-29 16:35:04 -05:00
C. R. Oldham	060cae8edc	Merge pull request #16959 from whiteinge/apache_modules-test-mode ... Fix apache_module states to return None and changes dict in test mode	2014-10-29 17:31:39 -04:00
Samuel Smith	49626afe30	Merge pull request #17012 from SmithSamuelM/sam_dev1 ... Fixed some tests. Refresh of masters in minion join behavior resets puid so consistent behavior	2014-10-29 15:20:49 -06:00
Colton Myers	90599c520a	Merge pull request #17001 from basepi/peerminepillar ... Disable compound/pillar matching for mine/peer	2014-10-29 14:59:44 -06:00