valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
29,426 Commits 24 Branches 182 Tags 341 MiB
f2e152ad9c
Commit Graph

29426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Rebert
f2e152ad9c client.ssh.wrapper.state: rename local vars to avoid shadowing 
************* Module salt.client.ssh.wrapper.state
salt/client/ssh/wrapper/state.py:39: [W0621(redefined-outer-name), sls] Redefining name 'high' from outer scope (line 118)
salt/client/ssh/wrapper/state.py:287: [W0621(redefined-outer-name), show_sls] Redefining name 'high' from outer scope (line 118)
salt/client/ssh/wrapper/state.py:314: [W0621(redefined-outer-name), show_top] Redefining name 'top' from outer scope (line 189)
 2014-04-22 12:11:40 -07:00
Thomas S Hatch
5df6f03246 Merge pull request #12181 from westurner/gitfs_tutorial_syntax 
DOC: Update GitFS documentation (syntax, links)
 2014-04-22 11:16:57 -06:00
Thomas S Hatch
962edb96d7 Merge pull request #12176 from terminalmage/issue11359 
Audit error reporting in states, fix traceback in state.template
 2014-04-22 11:08:32 -06:00
Thomas S Hatch
39afc8f067 Merge pull request #12046 from basepi/2014.1.3releasenotes 
Add 2014.1.3 release notes
 2014-04-22 09:47:10 -06:00
Joseph Hall
66204d0f2c Merge pull request #12189 from terminalmage/dmidecode-warning 
Change dmidecode notification to loglevel WARNING
 2014-04-22 08:28:53 -06:00
Erik Johnson
18056a318a Change dmidecode notification to loglevel WARNING 
This mitigates the following noise in salt-call runs:

[INFO    ] The `dmidecode` binary is not available on the system. GPU
grains will not be available.
 2014-04-22 09:23:01 -05:00
Joseph Hall
2d21a002d3 Merge pull request #12186 from s0undt3ch/hotfix/jenkins 
Remove trailing white-space.
 2014-04-22 07:32:59 -06:00
Pedro Algarvio
d18635ef02 Remove trailing white-space. 2014-04-22 13:58:39 +01:00
Pedro Algarvio
84b07d6b35 Merge pull request #12184 from s0undt3ch/hotfix/transifex-updates 
Update `doc/.tx/config`
 2014-04-22 12:30:12 +01:00
Jenkins
1faa107c97 Update doc/.tx/config 
Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
 2014-04-22 12:26:34 +01:00
Wes Turner
6aa523d9d1 DOC: Update GitFS documentation (syntax, links) 2014-04-22 05:42:10 -05:00
Joseph Hall
2a7738afa7 Merge pull request #12174 from whiteinge/doc-module-state-kwargs 
Added example to module state with a function that takes many kwargs
 2014-04-21 20:29:10 -06:00
Erik Johnson
74180b1da0 More test fixes 2014-04-21 20:36:23 -05:00
Erik Johnson
417267d6b3 Fix misspelling 2014-04-21 20:34:34 -05:00
Erik Johnson
c41526c913 Fix tests to match new error messages 2014-04-21 20:07:06 -05:00
Erik Johnson
cea7e9ca1f Change default outputter for state.template/template_str 2014-04-21 19:26:26 -05:00
Erik Johnson
3739da0ea4 Audit error reporting in states, fix traceback 
This commit audits error reporting, normalizing some of the terminology.
In addition, it fixes a traceback when state.template is called and
there is an empty short-dec with a trailing colon.

It also gives a more meaningful error message when the same thing is
done and state.sls/state.highstate is run.
 2014-04-21 19:23:27 -05:00
Joseph Hall
c14881e141 Merge pull request #12175 from mafrosis/salt-client-init 
saltcloud: ensure LocalClient instances use correct config
 2014-04-21 18:15:39 -06:00
mafro
c40b6a4435 saltcloud: ensure LocalClient instances use correct config 2014-04-22 10:04:53 +10:00
Thomas S Hatch
558c2b0144 Add onfail and onchanges requisite ins 2014-04-21 18:03:21 -06:00
Thomas S Hatch
c0568ba9fb Add onchanges requisite 
This requisite only frins the state if the required state changes stuff
 2014-04-21 17:48:06 -06:00
Seth House
ecc7b9c8a1 Added example to module state with a function that takes many kwargs 2014-04-21 17:27:48 -06:00
Thomas S Hatch
2991913ebc Merge pull request #12168 from rallytime/requisites_docs 
Clarifications for require, watch, and prereq in requisites docs
 2014-04-21 17:14:27 -06:00
Thomas S Hatch
247d8a1a0d Merge pull request #12153 from garethgreenaway/develop 
Adding the ability to splay scheduled jobs.
 2014-04-21 17:13:55 -06:00
Thomas S Hatch
53a4f979b8 Merge pull request #12151 from chrismoos/add_yaml_state 
Add state for managing YAML files.
 2014-04-21 17:07:28 -06:00
Thomas S Hatch
e25aa80487 Merge pull request #12145 from dmyerscough/highstate-on-start 
Fix #12137 where minions fail to perform a highstate on startup
 2014-04-21 16:03:20 -06:00
Erik Johnson
4e3430d751 Fix comments in shar build script 2014-04-21 16:38:34 -05:00
rallytime
12d5d87451 Some grammatical changes 2014-04-21 13:48:35 -06:00
rallytime
5789d4800c Clarifications for require, watch, and prereq in requisites documentation 2014-04-21 13:40:00 -06:00
Joseph Hall
72507ee124 Merge pull request #12166 from lyft/boto-sqs-fix-profile 
Fix region key fetching from profiles in boto_sqs
 2014-04-21 12:08:30 -06:00
Ryan Lane
1cfd12a5cf Fix region key fetching from profiles in boto_sqs 
I was pulling the wrong key in profiles for regions in boto_sqs.
This change addresses that.
 2014-04-21 10:58:59 -07:00
Colton Myers
129bb93b58 Merge pull request #12155 from terminalmage/issue10981 
Avoid traceback for unexpected pkgin/pkg_info output
 2014-04-21 11:54:11 -06:00
Thomas S Hatch
45a966793c Merge pull request #12125 from alusco/develop 
Adds kwargs to the ddns state module to support passing through args to the ddns module
 2014-04-21 11:15:54 -06:00
Thomas S Hatch
f25cbe25fb Merge pull request #12128 from basepi/pillargrains 
Ensure that the 'id' grain available to pillar is valid
 2014-04-21 11:14:42 -06:00
Mike Place
65edf97272 Merge pull request #12164 from cachedout/fix_file_test 
Remove test.
 2014-04-21 10:32:27 -06:00
Mike Place
9ac6e8e150 Remove test. 
Also pass makedirs correctly.
 2014-04-21 10:30:27 -06:00
Joseph Hall
ef7b9c7b57 Merge pull request #12163 from timoguin/develop 
added versionadded directive to new apache state
 2014-04-21 09:17:23 -06:00
Tim O'Guin
48345f7515 added versionadded directive to new apache state 2014-04-21 10:08:27 -05:00
Chris Moos
19f883f185 Add the ability for the file.serialize state to merge content. 
A new parameter, merge_if_exists, has been added to file.serialized
state. This enables the existing content to be preserved while merging
in the new data.
 2014-04-20 22:41:44 -07:00
Gareth J. Greenaway
d70ba50e09 moving the splay code out of the handle_func and into the eval func. more accurate splaying and no longer requires the time.sleep to be used. first run is not splayed but subsequent run are. 2014-04-20 21:45:55 -07:00
Gareth J. Greenaway
2cde351df7 Adding the ability to splay scheduled jobs. The splay option to a scheduled job can either be a single value, in which case the splay is taken from 0 to that value, or can be specified as a dictionary with starting and ending values. 2014-04-20 21:45:55 -07:00
David Boucha
bc80cb8a00 Merge pull request #12158 from UtahDave/develop 
fix check for test=True  per E712
 2014-04-20 21:35:24 -06:00
David Boucha
7bfcb9615c fix check for test=True per E712 2014-04-20 21:09:51 -06:00
David Boucha
9d083f1ac4 Merge pull request #12157 from UtahDave/develop 
2 hard returns before function def
 2014-04-20 19:54:25 -06:00
David Boucha
7ab1473697 2 hard returns before function def 2014-04-20 19:53:19 -06:00
Pedro Algarvio
a9eab2fd1c Merge pull request #12156 from UtahDave/develop 
add proper file extension to md5 files
 2014-04-21 02:49:30 +01:00
David Boucha
f2b9c9ccaa add proper file extension to md5 files 2014-04-20 18:37:59 -06:00
Seth House
31f23e5e5c Missed one *nix 
Missed this in 5f2379b.
 2014-04-20 17:54:50 -06:00
Seth House
5f2379b429 Revert "Fix anomalous back slash." 
This reverts commit fa2e04c2a5.

Converting the docstrings to raw feels like overkill just to allow the
"*nix" string. Let's just use "Unix" instead.
 2014-04-20 16:14:08 -06:00
Erik Johnson
c8a3f74d7e Avoid traceback for unexpected pkgin/pkg_info output 2014-04-20 16:13:12 -05:00