Commit Graph

29441 Commits

Author SHA1 Message Date
Erik Johnson
a76747f780 Split up contributing/development docs
This page has become massive and merits being split into two pages.
Also, it affords the opportunity of getting rid of an ambiguous header
name that causes confusion.

Fixes #10830.
2014-04-22 17:25:58 -05:00
Thomas S Hatch
139b8b5389 Merge pull request #12198 from terminalmage/issue11990
Remove unused "ports" argument from docker.start
2014-04-22 15:45:54 -06:00
Thomas S Hatch
c4b23604e4 Merge pull request #12197 from cachedout/6947
Add function to delete a minion cache with relative safety.
2014-04-22 15:41:28 -06:00
Erik Johnson
49733de57d Remove unused "ports" argument from docker.start 2014-04-22 16:41:25 -05:00
Mike Place
c1c691209f Pylint 2014-04-22 15:32:34 -06:00
Thomas S Hatch
1183120813 Merge pull request #12195 from cachedout/12173
Don't fire events on module refresh with --local
2014-04-22 15:05:15 -06:00
Mike Place
2ef2266be8 Add function to delete a minion cache with relative safety. 2014-04-22 15:03:46 -06:00
Mike Place
e7188e2c1d Don't fire events on module refresh with --local
Closes #12173

Use .get()
2014-04-22 14:16:27 -06:00
Thomas S Hatch
75f3567992 Merge pull request #12194 from basepi/saltrc12169
Change user salt configs to .saltrc from .salt to prevent conflicts
2014-04-22 14:05:37 -06:00
Thomas S Hatch
9b8087d093 Merge pull request #12193 from hulu/ssh-wrapper-state
client.ssh.wrapper.state: rename local vars to avoid shadowing
2014-04-22 14:04:49 -06:00
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
Colton Myers
6ab1bca783 Change user salt configs to .saltrc from .salt to prevent conflicts 2014-04-22 13:00:31 -06:00
Joseph Hall
23c826fb37 Merge pull request #12191 from cvrebert/patch-1
rm duplicate import of salt.utils.event in salt.client.ssh
2014-04-22 12:52:18 -06:00
Chris Rebert
5b39c4ba6a rm duplicate import of salt.utils.event in salt.client.ssh
************* Module salt.client.ssh
salt/client/ssh/__init__.py:35: [W0404(reimported), ] Reimport 'salt.utils.event' (imported line 31)
2014-04-22 11:51:44 -07:00
Joseph Hall
ec3aea330a Merge pull request #12190 from UtahDave/twilio
First commit of Twilio notifications module
2014-04-22 12:51:06 -06:00
David Boucha
8e37ae7178 First commit of Twilio notifications modules
Sending a message via SMS supported to begin with
2014-04-22 12:31:06 -06: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