36371 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Thomas S Hatch	e34e81f41b	Merge branch '2014.7' into develop ... Conflicts: salt/minion.py	2014-09-05 11:03:12 -06:00
Thomas S Hatch	5278fab542	Merge pull request #15543 from dr4Ke/pkg_removed_versions ... pkg.removed and purged implements version comparison	2014-09-05 10:38:32 -06:00
Thomas S Hatch	05e167becb	Merge pull request #15539 from thatch45/ssh_module_deploy ... Ssh module deploy	2014-09-05 10:36:26 -06:00
Thomas S Hatch	aaf728f09e	lint fix	2014-09-05 10:36:08 -06:00
Thomas S Hatch	b2016f7edc	Merge pull request #15538 from garethgreenaway/15511_rename_user ... Additions to user mangement modules	2014-09-05 09:33:01 -06:00
Thomas S Hatch	5235a4a829	Merge pull request #15534 from cimarronm/pip_upgrade ... Upgrade functionality for pip module and state	2014-09-05 09:21:00 -06:00
Christophe Drevet-Droguet	cc19b13f1c	pkg.removed and purged implements version comparison ... One should be able to remove packages only if they match specified version.	2014-09-05 15:12:45 +02:00
Thomas S Hatch	e86205a78d	It works! salt-ssh now autodeploys modules. ... It happens in the shim, so it is inline with module type changes without requireing a heavy deployment of a new thin tarball	2014-09-05 01:13:33 -06:00
Thomas S Hatch	62c84a6096	Check the validity of the entry before commiting the arg	2014-09-05 00:58:10 -06:00
Thomas S Hatch	b14a60e75f	Fix stack trace in write_odules	2014-09-05 00:56:12 -06:00
Thomas S Hatch	c6cb93d934	change the shim args for module loading	2014-09-04 23:58:00 -06:00
Thomas S Hatch	c9e2be9071	Pass module args to the shim	2014-09-04 23:54:50 -06:00
Thomas S Hatch	338385fb6e	Add mod_data routine	2014-09-04 23:24:32 -06:00
Gareth J. Greenaway	10d0abf6fc	Adding a rename function to all user management modules to rename user accounts.	2014-09-04 21:17:07 -07:00
Thomas S Hatch	f98aebba0b	modify shim to accept the modules as base64	2014-09-04 22:07:04 -06:00
Joseph Hall	c7a4cfc894	Merge pull request #15536 from s0undt3ch/hotfix/transifex-updates ... Update 'doc/.tx/config' - Build #160	2014-09-04 21:04:46 -06:00
Pedro Algarvio	d5c523d29e	Update 'doc/.tx/config' - Build #160 ... http://cookingwithsalt.org/job/salt/job/transifex/160/ Signed-off-by: Pedro Algarvio <pedro@algarvio.me>	2014-09-05 04:00:08 +01:00
Cimarron Mittelsteadt	cb03f8997a	ENH: Added upgrade to modules.pip and uptodate to states.pip to control upgrading pip packages	2014-09-04 18:01:28 -07:00
Thomas S Hatch	8ffa4903c9	Merge pull request #15531 from rallytime/pylint_fix ... Fix pylint errors	2014-09-04 17:18:33 -06:00
Thomas S Hatch	e7c49ecae0	Merge pull request #15528 from thatch45/thin_dir ... Use the user based thin dir for the states calls	2014-09-04 17:17:53 -06:00
rallytime	7938694e3b	Fix pylint errors	2014-09-04 16:11:20 -06:00
Thomas S Hatch	70950a1543	Merge pull request #15510 from lyft/boto_elb_resolve_error_on_deregister_instances_call ... deregister_instances and register_instances methods return True/False/None	2014-09-04 15:32:45 -06:00
Thomas S Hatch	e6992ab2b7	Merge pull request #15507 from cimarronm/pip_list_upgrades ... Additional functionality for modules.pip	2014-09-04 15:28:26 -06:00
Thomas S Hatch	921fd6362c	Merge pull request #15512 from ajacoutot/obsd-tests ... tests: recognize OpenBSD	2014-09-04 15:27:42 -06:00
Thomas S Hatch	88c4dac1be	Merge pull request #15516 from nmadhok/add-tag-docker-push ... Adding optional tag functionality to salt.modules.dockerio.push	2014-09-04 15:27:15 -06:00
Thomas S Hatch	f6e3951ddb	Merge pull request #15509 from ajacoutot/service-enabled-kwargs ... Service enabled kwargs	2014-09-04 15:25:19 -06:00
Thomas S Hatch	fa579b9e01	Use the user based thing dir for the states calls	2014-09-04 15:19:24 -06:00
Thomas S Hatch	c06ec6905f	Merge pull request #15505 from cimarronm/file_expanduser ... expanduser on paths in file	2014-09-04 15:18:00 -06:00
Thomas S Hatch	47cdefa33b	Merge pull request #15526 from basepi/fp-15378 ... Forward-port #15378 to 2014.7	2014-09-04 15:04:29 -06:00
Thomas S Hatch	9ea64cbc98	Merge pull request #15494 from basepi/bp-15340 ... Backport #15340 to 2014.7	2014-09-04 14:15:18 -06:00
Thomas S Hatch	033fe20083	Merge pull request #15521 from UtahDave/2014.7local ... Add some detail to the CloudClient api doc	2014-09-04 14:13:00 -06:00
Thomas S Hatch	abc1c037ac	Merge pull request #15522 from rallytime/multimaster_docs ... Update multimaster tutorial	2014-09-04 14:11:52 -06:00
Thomas S Hatch	7d3aab5911	Merge pull request #15504 from lyft/boto-vpc-fixes ... Lookup VPC security groups anywhere VPC resources are used	2014-09-04 14:04:25 -06:00
Joseph Hall	775a7a787f	Merge pull request #15525 from hulu/scripts-typos ... fix typos in salt/scripts.py	2014-09-04 14:01:14 -06:00
Joseph Hall	f4a9e4df07	Merge pull request #15524 from hulu/typos ... fix typos in doc/topics/jobs/job_cache.rst	2014-09-04 14:00:46 -06:00
Colton Myers	57e187d46f	Merge branch '2014.7' into develop ... Conflicts: salt/modules/mount.py	2014-09-04 13:45:03 -06:00
dsumsky	07ca8d8479	- raise SaltClientError exception when a minion can't connect to ... any of the configured masters	2014-09-04 13:43:40 -06:00
Chris Rebert	9545993db9	fix typos in salt/scripts.py	2014-09-04 12:21:38 -07:00
Chris Rebert	3053248b67	fix typos in doc/topics/jobs/job_cache.rst	2014-09-04 12:16:45 -07:00
rallytime	e5a1876462	Update multimaster tutorial	2014-09-04 12:58:19 -06:00
David Boucha	dbdf38095f	make example match other examples	2014-09-04 12:48:19 -06:00
David Boucha	0534a67af2	add example for creating vm with profile()	2014-09-04 12:43:18 -06:00
David Boucha	17ae088c9e	add code-block for formatting	2014-09-04 12:37:32 -06:00
Colton Myers	639f692130	Merge pull request #15518 from holmboe/patch-2 ... Minor doc change	2014-09-04 11:18:22 -06:00
Thomas S Hatch	5475d060e2	Merge pull request #15500 from basepi/bp-15466 ... Backport #15466 to 2014.7	2014-09-04 11:07:35 -06:00
Thomas S Hatch	f85fb339b7	Merge pull request #15498 from basepi/bp-15464 ... Backport #15464 to 2014.7	2014-09-04 11:07:13 -06:00
Thomas S Hatch	04c1822038	Merge pull request #15497 from basepi/bp-15410 ... Backport #15410 to 2014.7	2014-09-04 11:06:54 -06:00
Thomas S Hatch	05f5c024d2	Merge pull request #15496 from basepi/bp-15409 ... Backport #15409 to 2014.7	2014-09-04 11:06:38 -06:00
Thomas S Hatch	9f8683701e	Merge pull request #15493 from basepi/bp-15272 ... Backport #15272 to 2014.7	2014-09-04 11:05:58 -06:00
Thomas S Hatch	a2e8d72f21	Merge pull request #15462 from garethgreenaway/returner_experiments ... Updates to returners, consolidated code.	2014-09-04 11:03:23 -06:00