Thomas S Hatch
1cd95aa0c8
Revert "Sign the masters pub-key"
2014-06-30 15:04:53 -06:00
Thomas S Hatch
eda36a01a3
Merge pull request #13570 from felskrone/sign_master_keys
...
Sign the masters pub-key
2014-06-30 15:04:23 -06:00
Colton Myers
e1445e5cf7
Merge pull request #13852 from basepi/2014.1.6releasenotes
...
Add two fixes to release notes for 2014.1.6
2014-06-30 14:50:55 -06:00
Colton Myers
30efb97b30
Add two fixes to release notes
2014-06-30 14:50:24 -06:00
Mike Place
f8274c2b0d
Merge pull request #13851 from techhat/whitespace
...
Whitespace fix
2014-06-30 14:46:29 -06:00
Joseph Hall
6c2e8a2290
Whitespace fix
2014-06-30 14:41:36 -06:00
Joseph Hall
55ee3a2933
Merge pull request #13849 from spsoit/adds_random_module
...
Adds a basic randomness module
2014-06-30 14:40:35 -06:00
Joseph Hall
c55fa431cd
Merge pull request #13848 from whiteinge/doc-roster-modules
...
Added roster modules to the documentation
2014-06-30 14:32:45 -06:00
Chad Heuschober
865142a07b
Adds virtualname.
2014-06-30 16:28:03 -04:00
Chad Heuschober
6e93e05fc7
Adds a basic random module.
2014-06-30 16:04:42 -04:00
Seth House
918f12a376
Added roster modules to the documentation
2014-06-30 14:01:48 -06:00
Samuel Smith
379c235711
Merge pull request #13847 from SmithSamuelM/sam_raet_48
...
Salt Publish behavior now filters on available minions as per presence management
2014-06-30 13:41:57 -06:00
Samuel M Smith
4841d15122
Merge remote-tracking branch 'upstream/develop' into sam_raet_48
2014-06-30 13:40:15 -06:00
Samuel M Smith
a3a83dda29
Updated SaltPublisher behavior to only publish commands to available minions not all minions
...
Salt client still is waiting for results from all minions so it needs to also filter
and only expect returns from available minions
2014-06-30 13:38:34 -06:00
Samuel Smith
28cba0b313
Merge pull request #13846 from SmithSamuelM/sam_raet_48
...
Update RoadStack Manage presence behavior so uses aliveds and generates availables
2014-06-30 13:07:15 -06:00
Erik Johnson
34dd3574d1
Merge pull request #13839 from makinacorpus/bug2
...
Fallback to empty dict...
2014-06-30 14:06:39 -05:00
Samuel M Smith
180cb7da3e
Merge remote-tracking branch 'upstream/develop' into sam_raet_48
2014-06-30 13:05:58 -06:00
Samuel M Smith
9178e088eb
Update RoadStackManage behavior to generate availables
...
Added debug console message to see it working
2014-06-30 12:55:23 -06:00
Erik Johnson
06abbb02c7
Add rh_service bugfixes to 2014.1.6 release notes
2014-06-30 13:50:53 -05:00
Erik Johnson
488e906a87
Change loglevel to warning
2014-06-30 13:23:45 -05:00
Erik Johnson
3b478fafaa
Make log entry more descriptive
2014-06-30 13:15:11 -05:00
Erik Johnson
8e247d2603
Merge pull request #13837 from makinacorpus/bug
...
Skip invalid fileserver cache entries
2014-06-30 13:12:50 -05:00
Mathieu Le Marec - Pasquet
d52a99ca27
Fallback to empty dict...
...
This fixes #13838 .
2014-06-30 13:57:40 +02:00
Mathieu Le Marec - Pasquet
34bb4867c3
Skip invalid fileserver cache entries
...
This fixes #13836
2014-06-30 13:45:38 +02:00
Seth House
4947bd9c4c
Merge pull request #13833 from s0undt3ch/hotfix/lint
...
Lint Fixes
2014-06-30 01:45:10 -06:00
Pedro Algarvio
3edbc15e01
Strip trailing white-space
2014-06-30 01:03:59 +01:00
Pedro Algarvio
db58cbd8ca
Ignore import
2014-06-30 01:03:36 +01:00
Pedro Algarvio
cddc97ae33
Use string format
2014-06-30 01:03:36 +01:00
Pedro Algarvio
7cb8858af6
White space related lint fixes
2014-06-30 01:03:36 +01:00
Erik Johnson
852e0ca0ee
Merge pull request #13823 from gravyboat/develop
...
Update best_practices doc for code block issues.
2014-06-29 16:55:24 -05:00
Joseph Hall
24de7092aa
Merge pull request #13825 from techhat/keyring
...
Fix example for keyring driver
2014-06-28 22:10:49 -06:00
Joseph Hall
e43d601da0
Fix example for keyring driver
2014-06-28 21:13:47 -06:00
Forrest Alvarez
55916e8a7b
Update best_practices doc for code block issues.
2014-06-29 00:37:29 +00:00
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
