33226 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Pedro Algarvio	abaca98854	Merge pull request #13821 from terminalmage/docs ... Use code-block instead of double-colon + indent	2014-06-29 00:00:03 +01:00
Erik Johnson	b4a5f7c1bb	Use code-block instead of double-colon + indent ... The new sphinx style assumes that indented examples preceded by a double-colon are python. This changes he main walkthrough page so it uses a bash code-block in these areas, to be more accurate.	2014-06-28 14:35:21 -05:00
Thomas S Hatch	2ac645e27a	Merge pull request #13818 from nmadhok/fix-minor-state ... Putting **kwargs as function arguments	2014-06-27 23:26:28 -06:00
Thomas S Hatch	9f5fc38812	Merge pull request #13816 from whiteinge/match-filter_by ... Added a filter_by function to the match module	2014-06-27 23:26:00 -06:00
Thomas S Hatch	a3bf49924a	Merge pull request #13815 from cachedout/mysql_handling ... Exception handling in mysql module	2014-06-27 23:24:28 -06:00
Thomas S Hatch	e5065a9c17	Merge pull request #13814 from s0undt3ch/develop ... Update to latest bootstrap-script.sh, v2014.06.28	2014-06-27 23:24:09 -06:00
Thomas S Hatch	1cad1c3746	Merge pull request #13809 from nmadhok/fix-docker-push-module ... Fixed the behaviour of docker.push module	2014-06-27 23:23:10 -06:00
Seth House	afde747f46	Merge pull request #13817 from rallytime/cloud_extends_docs ... Clarify cloud configuration extends behaviors	2014-06-27 19:03:26 -06:00
Nitin Madhok	aec57bf231	Putting **kwargs as function arguments	2014-06-27 21:02:21 -04:00
rallytime	0636f2cb77	Clarify list merging and non-recursive behaviors of extends in cloud.config	2014-06-27 18:55:52 -06:00
Mike Place	45d5552851	Merge pull request #13808 from garethgreenaway/sysmod_fixes ... Fixes to state_doc, replacing a replace() with a split().	2014-06-27 18:07:54 -06:00
Mike Place	18d73ebcec	Minor doc fixes, clarity.	2014-06-27 17:59:38 -06:00
Seth House	382b76b1cb	Added a filter_by function to the match module	2014-06-27 17:44:29 -06:00
Mike Place	ad07734c6d	Exception handling in mysql module	2014-06-27 17:44:07 -06:00
Pedro Algarvio	ce4036948d	Update to latest bootstrap-script.sh, v2014.06.28	2014-06-28 00:37:24 +01:00
Samuel Smith	2a8e92751b	Merge pull request #13812 from SmithSamuelM/sam_raet_48 ... Alloweds and changeds from manage presence now in data store	2014-06-27 17:16:07 -06:00
Samuel M Smith	b8431b4e4b	Merge remote-tracking branch 'upstream/develop' into sam_raet_48	2014-06-27 17:10:11 -06:00
Seth House	7725350416	Merge pull request #13811 from lyft/doc-additions ... Add docs for boto_elasticache and apache_module	2014-06-27 17:10:10 -06:00
Samuel M Smith	45b2ddc8ee	alloweds and changeds now put into datastore	2014-06-27 17:09:28 -06:00
David Boucha	7b57ee8651	Merge pull request #13810 from UtahDave/develop ... Don't stacktrace if yard is already there	2014-06-27 16:41:29 -06:00
David Boucha	cf5f0fe9ca	Don't stacktrace if yard is already there	2014-06-27 16:40:14 -06:00
Nitin Madhok	b0265c75e8	Fixed the behaviour of docker.push module	2014-06-27 18:36:34 -04:00
Gareth J. Greenaway	831d5fec69	Fixes to state_doc, replacing a replace() with a split().	2014-06-27 14:15:31 -07:00
Colton Myers	0c4b66aa8a	Merge pull request #13806 from whiteinge/rest_cherrypy-401-fix ... Raise a 401 reponse instead of redirecting to the login page	2014-06-27 15:14:17 -06:00
Colton Myers	8b3c55bcc4	Merge pull request #13805 from whiteinge/jinja-dot-lookup-salt-funs ... Allow dot-lookup of Salt functions in Jinja templates	2014-06-27 15:13:28 -06:00
Colton Myers	69c1f2d4e0	Merge pull request #13804 from whiteinge/show-full-context-versionadded ... Added missing versionadded for show_full_context()	2014-06-27 15:12:33 -06:00
Seth House	11b21ae828	Allow dot-lookup of Salt functions in Jinja templates	2014-06-27 14:07:48 -06:00
Seth House	f18a636628	Raise a 401 reponse instead of redirecting to the login page ... Also fixed bad tests that should have caught this. Fixes saltstack/salt-api#155.	2014-06-27 14:03:34 -06:00
Seth House	da464e0157	Added missing versionadded for show_full_context()	2014-06-27 13:58:21 -06:00
Thomas S Hatch	0a611598e6	Merge pull request #13803 from claytron/version-numbers ... Clarify version numbering scheme	2014-06-27 13:23:07 -06:00
Thomas S Hatch	a56bed4d03	Don't force import of salt.master in integration tests	2014-06-27 13:13:41 -06:00
Clayton Parker	dfec35fe47	fix error on make clean with no translations	2014-06-27 13:45:39 -04:00
Clayton Parker	33e6cd6191	clarify the version numbering scheme	2014-06-27 13:45:13 -04:00
Samuel Smith	a09a3c02c4	Merge pull request #13799 from SmithSamuelM/sam_raet_48 ... Fixed some typos, Also slowed down rate at which presence manage runs	2014-06-27 10:30:59 -06:00
Samuel M Smith	e700facb2b	Merge remote-tracking branch 'upstream/develop' into sam_raet_48	2014-06-27 10:29:19 -06:00
Samuel M Smith	31c71df286	updated flo scripts slow down manage ... fix typos	2014-06-27 10:28:30 -06:00
Thomas S Hatch	89ec25ff91	Merge pull request #13797 from sandbender/so_mods ... Add support for additional, optional CLI arg to "salt-run thin.generate"...	2014-06-27 09:45:50 -06:00
Thomas S Hatch	16ec2f03b2	Merge pull request #13794 from sandbender/extra_filerefs ... Adds support for extra_filerefs=salt://path1,salt://path2 CLI arg to inc...	2014-06-27 09:39:15 -06:00
Thomas S Hatch	75f62e2117	Merge pull request #13785 from mirath/develop ... Fix to issue #12648. Option to get diff between last two highstates calls	2014-06-27 09:19:57 -06:00
Joseph Hall	edc36853f3	Merge pull request #13795 from techhat/ec2 ... Fixing quotes and style in ec2 driver	2014-06-27 07:51:22 -06:00
Rudy X. Desjardins	4f07330f89	Add support for additional, optional CLI arg to "salt-run thin.generate" (which gets passed through to ssh_py_shim) to speciy comma separated list of *native* python module names to be packaged up in the thin tar (ie: single-file python modules implemented as .so files). This type of module does not play well "normally" using the extra_mods functionality of thin.generate, and implicit defaults do not work for native extensions where the master/minion are in a heterogenous environment, ie: non-matching architectures. ... This way, .so modules (native extensions) can be packaged into a thin tar even in the presence of a heterogeneous environment, assuming the master has available the correct binary .so module for the target minion architecture. Addresses/solves/fixes issue #13769	2014-06-27 09:43:43 -04:00
Joseph Hall	b6ce138f08	Fixing quotes and style in ec2 driver	2014-06-27 07:29:54 -06:00
Joseph Hall	9b5a6d575e	Merge pull request #13790 from danielrowles-wf/ec2-secondary-ip-addresses ... Add support for adding secondary IP addresses to network interfaces	2014-06-27 07:26:15 -06:00
Rudy X. Desjardins	73fd686d07	Adds support for extra_filerefs=salt://path1,salt://path2 CLI arg to include *template*-referenced files (ie: includes) in thin data package sent to minion during salt-ssh. ... Fixes issue #9878	2014-06-27 09:21:09 -04:00
Dan Rowles	5f9c3a3aeb	Issues with VT module in ubuntu trusty	2014-06-27 12:44:41 +00:00
Joseph Hall	afa26586f3	Merge pull request #13789 from mgregson/fix-digitalocean-api-root-and-allow-override ... Fix digitalocean API root	2014-06-27 06:04:15 -06:00
Michael Gregson	9442ed59b5	Fix digitalocean API root ... It has changed as of the release of their 2.0 API. Also, this now allows the user to override the API root in the provider config.	2014-06-27 03:34:45 -04:00
Thomas S Hatch	9d5356643d	Prompt the reloading of grains and modules from events	2014-06-27 00:25:12 -06:00
Thomas S Hatch	11b5ebc7b0	et ioflo data if module refresh is needed	2014-06-27 00:02:19 -06:00
Thomas S Hatch	04374d5f58	Enable raet minion event fireing	2014-06-26 23:56:53 -06:00