25428 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
John Anderson	e1fa6955ff	Tighten up regex a bit	2014-02-04 11:34:18 -07:00
Mike Place	8a0167e72b	Loosen regex to allow for quoting quirk on Ubuntu 10.x	2014-02-04 18:00:48 +00:00
Pedro Algarvio	dfc8fc2ab9	Merge pull request #10168 from s0undt3ch/develop ... Try to catch errors and sleep between `tx` calls	2014-02-04 06:36:58 -08:00
Pedro Algarvio	f76e75333e	Try to catch errors and sleep between tx calls	2014-02-04 14:35:58 +00:00
Joseph Hall	17d5e733c2	Merge pull request #10162 from gdi2290/patch-1 ... update copyright year	2014-02-04 04:22:21 -08:00
Joseph Hall	1974c1b596	Merge pull request #10163 from regilero/develop ... Doc: fix bad usage of requisite in man salt	2014-02-04 04:19:10 -08:00
regilero	93f8cdc0f0	Doc: fix bad usage of requisite in man salt	2014-02-04 10:47:34 +01:00
PatrickJS	a3c64bcb7d	update copyright year	2014-02-03 22:59:06 -08:00
Erik Johnson	3ed0996a90	Miscellaneous docs fixes ... Formatting, quieting build errors, etc.	2014-02-03 22:11:56 -06:00
Thomas S Hatch	2799f4ff83	lint and style fixes	2014-02-03 20:30:30 -07:00
Thomas S Hatch	8690fd955f	Merge pull request #10159 from SmithSamuelM/sam_2014_02_03 ... Removed obsolete create instances	2014-02-03 19:28:37 -08:00
Thomas S Hatch	c03b25dbd9	whitespace	2014-02-03 20:27:11 -07:00
Thomas S Hatch	0600ee6f3c	lint fixes	2014-02-03 19:25:53 -07:00
Thomas S Hatch	27849075a7	Add better error tracking	2014-02-03 19:06:55 -07:00
Samuel M Smith	a8e9239b23	Merge remote-tracking branch 'upstream/develop' into sam_2014_02_03 ... Conflicts: salt/transport/road/raet/packeting.py	2014-02-03 17:52:18 -07:00
Samuel M Smith	c31b90b018	Removed obsolete create instances ... Added local test runner	2014-02-03 17:46:36 -07:00
Thomas S Hatch	350bf0fc7f	Add utf lines to table import files	2014-02-03 17:28:22 -07:00
Thomas S Hatch	489fde3141	clean up bad import of table libs	2014-02-03 17:26:26 -07:00
Thomas S Hatch	1582137334	whitespace	2014-02-03 17:24:45 -07:00
Thomas S Hatch	d9063c69dd	Initial commit for the table package, a generic backend for crypto ... this is still EXPERIMENTAL!! Not yet used in salt and is under heavy development	2014-02-03 17:18:04 -07:00
Joseph Hall	3a894d7606	Merge pull request #10154 from abemusic/features/ec2-query-retry ... Retry query on certain EC2 status codes	2014-02-03 16:07:18 -08:00
Thomas S Hatch	f072a9531b	Add initial raet docs	2014-02-03 17:06:16 -07:00
Thomas S Hatch	23272f2a74	style cleanup	2014-02-03 17:04:48 -07:00
Thomas S Hatch	d2f3addfd5	Initial add of raet backend libs	2014-02-03 16:44:13 -07:00
Thomas S Hatch	2a7c10fe5b	Merge pull request #10152 from erchn/develop ... break out fields in event fired instead of parsing out of plain text	2014-02-03 15:24:30 -08:00
Thomas S Hatch	e50c8145d0	Merge pull request #10150 from terminalmage/docs ... Improve documentation on running salt as non-root	2014-02-03 15:18:34 -08:00
Thomas S Hatch	f51f69b773	Merge pull request #10130 from cvrebert/npm-kwargs ... remove unused apparently-unnecessary **kwargs from npm.installed+removed	2014-02-03 15:14:49 -08:00
Thomas S Hatch	d494587636	Merge pull request #10104 from tedski/9578 ... Fix incorrect service state module execute result	2014-02-03 15:13:46 -08:00
Thomas S Hatch	7cb424ea98	Merge pull request #10049 from JustinCarmony/saltfile ... Saltfile Feature	2014-02-03 15:08:44 -08:00
Colton Myers	854dffaf47	Merge pull request #10117 from terminalmage/issue5733 ... pkg.installed/latest: don't refresh_db if refresh==False	2014-02-03 14:43:51 -08:00
Erik Johnson	dbed6fe4b0	Merge pull request #10113 from kaithar/feature/Clean-pr-10036 ... [Clean] Strip leading path separator characters in a portable way.	2014-02-03 13:14:27 -08:00
Erik Johnson	fa468c3797	Fix typo in master config file ... Resolves #10144.	2014-02-03 14:12:21 -06:00
Abe Music	d5caab2444	Retry query on certain EC2 status codes	2014-02-03 14:07:36 -06:00
Ethan Erchinger	17b4081255	break out fields in event fired instead of parsing out of plain text	2014-02-03 11:24:28 -08:00
Erik Johnson	e14d701b2f	Improve documentation on running salt as non-root	2014-02-03 13:05:51 -06:00
Pedro Algarvio	ecba2649fd	Merge pull request #10147 from s0undt3ch/develop ... Allow specifying the transifex rc file path	2014-02-03 10:09:04 -08:00
Pedro Algarvio	b045278908	Allow specifying the transifex rc file path	2014-02-03 18:04:21 +00:00
Pedro Algarvio	441e3feb53	Merge pull request #10142 from s0undt3ch/develop ... Allow the transifex secrets to be fetched from environment	2014-02-03 09:24:44 -08:00
Pedro Algarvio	a9f652bb92	Allow the transifex secrets to be fetched from environment	2014-02-03 17:05:39 +00:00
Thomas S Hatch	ff409956a3	Merge pull request #10124 from garethgreenaway/develop ... Adding a check to ensure -m multiport is included if dports & sports is used	2014-02-03 08:48:39 -08:00
Thomas S Hatch	af003a067b	Merge pull request #10116 from jacksontj/develop ... Adding warning about old yamilify arg passing	2014-02-03 08:43:22 -08:00
Thomas S Hatch	0e2ddb908b	Merge pull request #10103 from makinacorpus/grains ... allow ext_dirs for grains	2014-02-03 08:36:33 -08:00
Thomas S Hatch	62bb3d8fb1	Merge pull request #10101 from syphernl/fixes/runnerscache ... Allow pillars to be cleared for all minions	2014-02-03 08:30:19 -08:00
Thomas S Hatch	8f54bbfb3e	Merge pull request #10125 from rgbkrk/patch-3 ... Fix requisite type in supervisor state	2014-02-03 08:29:21 -08:00
Thomas S Hatch	185dceeb5f	Merge pull request #10089 from mgwilliams/salt-run-doc ... salt-run: colorize and strip rst when printing docs	2014-02-03 08:28:16 -08:00
Thomas S Hatch	74b0f02c65	Merge pull request #10131 from bretep/patch-3 ... CRITICAL: State's don't send the environment...	2014-02-03 08:18:57 -08:00
David Boucha	78e7ef0afe	Merge pull request #10139 from KB1JWQ/docfix ... Added homebrew installation to website	2014-02-03 06:37:29 -08:00
Corey Quinn	a73953be9d	Added homebrew installation to website	2014-02-03 15:35:34 +01:00
Joseph Hall	6b39fbec81	Merge pull request #10137 from s0undt3ch/hotfix/rabbitmq-virtual-fixes ... rabbitmq module and test fixes/simplifications	2014-02-03 04:33:08 -08:00
Pedro Algarvio	da54151a1f	Merge pull request #10135 from pille/patch-3 ... fix doc typo	2014-02-03 03:31:31 -08:00