muffl0n
3e231304a5
Remove first three lines if starting with "DO NOT EDIT THIS FILE"
...
Patch for #10312
2014-02-10 15:35:14 +01:00
Pedro Algarvio
1de2a62733
Merge pull request #10303 from s0undt3ch/develop
...
Minor formatting
2014-02-10 11:10:39 +00:00
Joseph Hall
92f8884980
Merge pull request #10310 from rgbkrk/patch-4
...
s/law/lay
2014-02-09 21:13:59 -07:00
Kyle Kelley
7d69e42de1
s/law/lay
2014-02-09 21:12:44 -07:00
Pedro Algarvio
41b9b1a8d9
No need to escape quotes
2014-02-09 06:44:16 +00:00
Pedro Algarvio
7f62d5f418
Merge pull request #10302 from gtmanfred/develop
...
[salt] need the extra space
2014-02-09 05:48:13 +00:00
Daniel Wallace
cda8ea170b
[salt] need the extra space
...
Otherwise the first package gets concatinated with the --needed
2014-02-08 23:17:26 -06:00
Joseph Hall
f526267d2b
Merge pull request #10301 from gtmanfred/develop
...
[salt.cloud] missing a : in documentation
2014-02-08 21:03:02 -07:00
Daniel Wallace
7042099c14
[salt.cloud] missing a : in documentation
2014-02-08 22:05:14 -06:00
Pedro Algarvio
7560ab3984
Double to single quotes and enforce .format()
2014-02-09 02:36:25 +00:00
Pedro Algarvio
767893956d
Merge pull request #10295 from terminalmage/docs
...
Add warning re: gitfs cache in pre-Hydrogen releases
2014-02-09 00:36:11 +00:00
Pedro Algarvio
5233853558
Merge pull request #10299 from s0undt3ch/develop
...
Minor output cosmtic changes
2014-02-09 00:35:18 +00:00
Pedro Algarvio
8561be1fee
For output consistency.
2014-02-09 00:21:18 +00:00
Joseph Hall
4c63496603
Merge pull request #10296 from techhat/openstack
...
Openstack metadata doesn't like profile to be set to None
2014-02-08 15:07:58 -07:00
Joseph Hall
44fa27ab7e
We can't use None for the metadata
2014-02-08 15:05:18 -07:00
Joseph Hall
b4c94420d7
Handling default profile for cloud.create
2014-02-08 14:42:56 -07:00
Erik Johnson
54d0241f58
Add warning re: gitfs cache in pre-Hydrogen releases
2014-02-08 15:36:45 -06:00
Pedro Algarvio
26e5c92f21
Another required white-space
2014-02-08 20:23:25 +00:00
Pedro Algarvio
887a7f2d47
Merge pull request #10290 from techhat/rackspace
...
Make rackspace vs openstack distinction clearer, refs #10286
2014-02-08 18:13:51 +00:00
Mike Place
e63532411f
Merge pull request #10292 from zzzirk/develop
...
Fixed discrepancies in documentation for the absent function.
2014-02-08 09:49:57 -07:00
Lou Zirkel
e100eb01c8
Fixed discrepancies in documentation for the db_password, db_host, and
...
db_port arguments to the absent function.
2014-02-08 07:27:11 -07:00
Joseph Hall
11ae7076f5
Make rackspace vs openstack distinction clearer, refs #10286
2014-02-08 05:29:32 -07:00
Thomas S Hatch
9e968dd297
Clean up grain lookups from #10202
2014-02-07 22:15:21 -07:00
Thomas S Hatch
e937a85fe2
Add initial minion file for ioflo minion
2014-02-07 22:09:02 -07:00
Thomas S Hatch
0a43de249d
whitespace
2014-02-07 22:09:02 -07:00
Thomas S Hatch
370f291a27
Merge pull request #10202 from Katafalkas/mdadm_module_config_
...
Basic mdadm.conf capability
2014-02-07 22:08:22 -07:00
Thomas S Hatch
ccc2515088
Merge pull request #10285 from s0undt3ch/hotfix/lint-and-formatting
...
Fix white-space related lint issues
2014-02-07 22:03:09 -07:00
Thomas S Hatch
1110838b81
Merge pull request #10283 from terminalmage/gitfs-dry-cleanup
...
Some DRY cleanup/error reporting improvement for gitfs
2014-02-07 22:02:11 -07:00
Thomas S Hatch
26ece483a0
Merge pull request #10277 from cachedout/pydsl_doc_import
...
More PyDSL documentation
2014-02-07 22:01:35 -07:00
Thomas S Hatch
93384381cd
Merge pull request #10267 from cachedout/#9746
...
Compound commands partial fix
2014-02-07 21:40:14 -07:00
Thomas S Hatch
d05628029b
Merge pull request #10266 from ticosax/bug-fix-previous-docker-id
...
In case of errors, iinfos['out'] is a string that contains the traceback
2014-02-07 21:36:59 -07:00
Thomas S Hatch
e4887ad891
Merge pull request #10264 from abique/patch-1
...
[pacman] don't reinstall if it is not needed
2014-02-07 21:34:57 -07:00
Thomas S Hatch
4e36e98757
Merge pull request #10254 from SmithSamuelM/sam_2014_02_03
...
Sam 2014 02 03
2014-02-07 21:26:32 -07:00
Thomas S Hatch
a407bb5cdc
Merge pull request #10250 from cachedout/#9991
...
Match against lists in nested dicts in grains
2014-02-07 21:24:45 -07:00
Thomas S Hatch
a378e4c1da
Merge pull request #10244 from cachedout/#10030
...
Minion log file 0600
2014-02-07 21:17:34 -07:00
Thomas S Hatch
b4bc256c2e
Merge pull request #10242 from s0undt3ch/hotfix/lint
...
Start failing lint on unused imports
2014-02-07 21:14:37 -07:00
Pedro Algarvio
6967b2f801
Fix white-space related lint issues
2014-02-08 03:50:51 +00:00
Erik Johnson
f52dcd0402
Some DRY cleanup/error reporting improvement for gitfs
...
This commit does some DRY cleanup in the __virtual__ function, as well
as some of the provider verification code. In addition, it fixes a
couple minor aesthetic error reporting issues.
2014-02-07 21:48:21 -06:00
Pedro Algarvio
41f82b39e0
Merge pull request #10282 from s0undt3ch/develop
...
We need a bigger timeout, salt's repo is pretty big now.
2014-02-08 03:38:10 +00:00
Pedro Algarvio
fd306ea0b0
We need a bigger timeout, salt's repo is pretty big now.
2014-02-08 03:07:30 +00:00
David Boucha
bba617cc5a
Merge pull request #10279 from russellballestrini/patch-1
...
Update runners index.rst
2014-02-07 18:45:37 -07:00
Russell Ballestrini
773e2f85ad
Update runners index.rst
...
Adjusted the wording for accuracy.
2014-02-07 20:27:40 -05:00
Pedro Algarvio
58b1381f7c
Merge pull request #10278 from s0undt3ch/develop
...
No need for the line breaks
2014-02-08 00:40:09 +00:00
Pedro Algarvio
bb9e431491
No need for the line breaks
2014-02-08 00:33:26 +00:00
Mike Place
4687bdabd4
Add documentation about inserting a Python module into the namespace
...
of a running PyDSL state.
2014-02-07 16:53:33 -07:00
Thomas S Hatch
3bf8e3f3d0
Fix #10223
2014-02-07 14:26:06 -07:00
Thomas S Hatch
5508307a27
Merge pull request #10204 from jhenry82/randomize_master_selection
...
Randomize master selection
2014-02-07 14:20:22 -07:00
Joseph Hall
cdc4bc6faf
Merge pull request #10274 from kerick/aix-work
...
Fix cron module for AIX, Fix set_special documentation
2014-02-07 14:14:36 -07:00
Jayson Cofell
432d7bc640
Fix cron module for AIX, Fix set_special documentation
2014-02-07 15:03:50 -06:00
Mike Place
af6bfd9b4c
Lint
2014-02-07 11:47:08 -07:00