34745 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnson	a42c536138	Merge pull request #14871 from hemebond/2014.7 ... Fix example code block in grains.filter_by	2014-08-09 17:11:22 -05:00
Joseph Hall	ff16094961	Merge pull request #14877 from whiteinge/doc-mine-function-aliases ... Documented the mine_function alises	2014-08-09 12:59:11 -06:00
Seth House	05022c6adb	Documented the mine_function alises ... Closes #14738	2014-08-09 11:14:25 -06:00
Pedro Algarvio	4bc8936afa	Merge pull request #14874 from s0undt3ch/hotfix/transifex-updates ... Update 'doc/.tx/config' - Build #139	2014-08-09 15:31:29 +01:00
Pedro Algarvio	b2dbfbfce0	Update 'doc/.tx/config' - Build #139 ... http://cookingwithsalt.org/job/salt/job/transifex/139/ Signed-off-by: Pedro Algarvio <pedro@algarvio.me>	2014-08-09 15:30:36 +01:00
Tom Atkinson	6da493b7e8	Support static option in batch mode	2014-08-09 05:51:38 +02:00
James O'Neill	79db57f08f	Fix example code block in grains.filter_by	2014-08-09 13:41:40 +12:00
Thomas S Hatch	ec5b167497	Merge pull request #14864 from rallytime/git_config ... Change git module config docs to match ordering	2014-08-08 17:18:11 -06:00
Thomas S Hatch	c5580e6f81	Merge pull request #14852 from cachedout/tty_move ... Call subprocess directly	2014-08-08 16:30:06 -06:00
Thomas S Hatch	7a7c18cd46	Merge pull request #14843 from whiteinge/salt-npm-no-changes ... Fix missing npm check for no action	2014-08-08 16:23:26 -06:00
Thomas S Hatch	d6465fe75c	Merge pull request #14841 from terminalmage/fix-new-outputter ... Fix formatting in newline_values_only docstring	2014-08-08 16:23:02 -06:00
Thomas S Hatch	18df0f9028	Merge pull request #14758 from cachedout/14736 ... Prep ipv4/6 socket for syndic	2014-08-08 15:57:05 -06:00
Thomas S Hatch	f327d3a473	Merge pull request #14858 from terminalmage/rename-delim-arg ... Deprecate "delim" argument in favor of "delimiter"	2014-08-08 15:49:37 -06:00
Thomas S Hatch	d6e3ce1c98	Merge pull request #14857 from thatch45/2014.7 ... Revert "Pull out pending_events changes and reuse"	2014-08-08 15:44:24 -06:00
rallytime	1d35d59ae4	Fix docs and CLI examples for git.config_get	2014-08-08 13:35:22 -06:00
rallytime	3714234231	Update docs arg order to match git_config's def	2014-08-08 13:32:19 -06:00
rallytime	10fa9eaadb	Change CLI example to match git_config arg ordering	2014-08-08 13:27:16 -06:00
Thomas S Hatch	b0561a703b	Revert "Pull out pending_events changes and reuse" ... This reverts commit e832a3a17f.	2014-08-08 12:49:46 -06:00
Erik Johnson	574a9d10b8	Rename misspelled CLI argument	2014-08-08 12:54:02 -05:00
Erik Johnson	6a3c290325	Rename misspelled CLI argument	2014-08-08 12:54:02 -05:00
Erik Johnson	7240fcae53	salt.modules.match: Deprecate the "delim" argument ... This is being replaced by "delimiter" to make it more user-friendly.	2014-08-08 12:50:26 -05:00
Erik Johnson	8c126f6b13	rename "delim" argument to "delimiter"	2014-08-08 12:29:26 -05:00
Erik Johnson	6943f97e3c	rename "delim" argument to "delimiter"	2014-08-08 12:29:26 -05:00
Mike Place	95eea1fd92	Call subprocess directly	2014-08-08 09:56:26 -06:00
Thomas S Hatch	82957bb5cc	Merge pull request #14842 from s0undt3ch/hotfix/manage.version ... Skip tests if real mock library is not available	2014-08-08 09:24:41 -06:00
Seth House	1e47a8f125	Fix missing npm check for no action	2014-08-07 21:09:58 -04:00
Erik Johnson	dcfa621717	Add newline_values_only outputter to toctree	2014-08-07 19:25:03 -05:00
Erik Johnson	79cd6203d9	Make docstring more descriptive	2014-08-07 19:03:03 -05:00
Erik Johnson	878e263f13	Make helper functions private ... This hides them from the docs	2014-08-07 19:01:51 -05:00
Pedro Algarvio	c9be462f00	Skip tests if real mock library is not available	2014-08-08 00:52:47 +01:00
Pedro Algarvio	a399e62ca2	Skip tests if real mock library is not available	2014-08-08 00:46:21 +01:00
Pedro Algarvio	97f1b00818	Skip tests if real mock library is not available	2014-08-08 00:46:21 +01:00
Pedro Algarvio	faf3157637	Skip tests if real mock library is not available	2014-08-08 00:46:21 +01:00
Pedro Algarvio	21141af46a	Skip tests if real mock library is not available	2014-08-08 00:46:21 +01:00
Pedro Algarvio	239b2480ae	Skip tests if real mock library is not available	2014-08-08 00:46:21 +01:00
Erik Johnson	ac90651942	Fix formatting in newline_values_only docstring	2014-08-07 18:40:09 -05:00
Thomas S Hatch	ae19770a23	Merge pull request #14833 from whiteinge/salt-saltsh-checks ... Minor checks to the saltsh.py repl	2014-08-07 15:52:29 -06:00
Colton Myers	d99440e6c9	Merge pull request #14823 from cachedout/tty_move ... Tty move	2014-08-07 14:24:28 -06:00
Colton Myers	989158badc	Merge pull request #14830 from UtahDave/2014.7new ... Don't try to get a hash of a directory	2014-08-07 13:16:00 -06:00
Thomas S Hatch	ebe3d43f24	Merge pull request #14798 from whiteinge/npm-list-ignore-warnings ... Use the silent option when listing npm packages	2014-08-07 12:24:43 -06:00
Thomas S Hatch	e17ca37530	Merge pull request #14796 from whiteinge/salt-event-fire_master_env ... Added function to fire event using env vars for event data	2014-08-07 12:24:31 -06:00
Seth House	429cc40376	Minor checks to the saltsh.py repl	2014-08-07 14:24:30 -04:00
Thomas S Hatch	5b0b410d0f	Merge pull request #14790 from whiteinge/doc-formulas-update ... Misc cleanups, clarifications, and additions to the formulas conventions doc	2014-08-07 12:23:37 -06:00
Erik Johnson	ec43a24d67	Merge pull request #14822 from whiteinge/salt-npm-pkgs ... Added pkgs support to the npm module/state	2014-08-07 12:50:30 -05:00
David Boucha	6b0c5f2e01	Don't try to get a hash of a directory	2014-08-07 11:50:00 -06:00
Thomas S Hatch	41c5d7f80b	Merge pull request #14828 from thatch45/2014.7 ... lint fix	2014-08-07 11:45:28 -06:00
Thomas S Hatch	b468b7bd33	lint fix	2014-08-07 11:44:52 -06:00
Thomas S Hatch	8b5a3c9eca	Merge pull request #14807 from thatch45/2014.7 ... Properly catch the crypt import @gtmanfred	2014-08-07 11:44:38 -06:00
Mike Place	c3b476a6c0	Grr, typo	2014-08-07 11:37:06 -06:00
Mike Place	fbbfb44642	More lint and doc strings for test	2014-08-07 11:32:55 -06:00