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
28,241 Commits 24 Branches 182 Tags 341 MiB
0144b24a24
Commit Graph

28241 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pedro Algarvio
0144b24a24 Update test case to new return format. 
Also, the comparison check is old, new or better, known -> unknown
 2014-03-24 17:07:50 +00:00
Pedro Algarvio
6fa685b1d2 Add some more files to the exempt ones 2014-03-24 17:02:23 +00:00
David Boucha
67c17ce38a Merge pull request #11481 from UtahDave/develop 
fixup some docstrings
 2014-03-24 10:23:37 -06:00
David Boucha
365d73b597 fixup some docstrings 2014-03-24 10:18:41 -06:00
Joseph Hall
5a1b168c11 Merge pull request #11479 from terminalmage/docs 
A bunch of docs fixes
 2014-03-24 10:18:01 -06:00
Erik Johnson
18bb7147a4 Fix RST syntax errors 2014-03-24 11:12:56 -05:00
Erik Johnson
f9c6972ecd add proxmox to toctree 2014-03-24 11:12:32 -05:00
Erik Johnson
efc89ea897 add versionadded directive 2014-03-24 11:12:11 -05:00
Erik Johnson
bbb54bf64f add versionadded directive 2014-03-24 11:11:27 -05:00
Erik Johnson
bed14bfb80 Formatting fixes, plus added missing ref target 2014-03-24 11:10:13 -05:00
Joseph Hall
50f35d36d5 Merge pull request #11477 from terminalmage/pull-11420-docs-fix 
Add versionadded directives for new yumpkg option
 2014-03-24 09:57:08 -06:00
Erik Johnson
3333b78d47 Add versionadded directives for new yumpkg option 
Also some miscellaneous RST fixes and some spacing fixes to make pylint
happy.
 2014-03-24 10:44:31 -05:00
Thomas S Hatch
8a560a869c lint fixes 2014-03-24 09:32:27 -06:00
Thomas S Hatch
f0f31971a4 Set onfail as a reserved keyword 2014-03-24 09:17:23 -06:00
Thomas S Hatch
29c74dc74b switch postmortem to onfail 2014-03-24 09:17:23 -06:00
Thomas S Hatch
0401b4cc9a Merge pull request #11420 from knoxr/yumpkg_disableexcludes_feature 
Issue 11415: new feature - yumpkg now supports the 'disableexcludes' option for the methods check_d...
 2014-03-24 09:16:44 -06:00
Joseph Hall
250b304468 Merge pull request #11469 from makinacorpus/cloud 
states.cloud: handle better the error outputs
 2014-03-23 19:53:33 -06:00
Mathieu Le Marec - Pasquet
900ea81666 states.cloud: handle better the error outputs 2014-03-23 23:26:35 +01:00
Pedro Algarvio
8aa6bbddb6 Merge pull request #11465 from terminalmage/check-pillar-data-type 
Raise exception when pillar data is non-dict
 2014-03-23 21:53:58 +00:00
Pedro Algarvio
dc051d7370 Merge pull request #11464 from terminalmage/minion-outputter 
Override __outputter__ when functions trigger exceptions
 2014-03-23 21:51:43 +00:00
Pedro Algarvio
b3aa5d4dfe Merge pull request #11463 from s0undt3ch/develop 
Permissions fixes
 2014-03-23 21:39:52 +00:00
Erik Johnson
9133414af8 Raise exception when pillar data is non-dict 
This does the same thing as was done for state execution modules, to the
state.sls runner.
 2014-03-23 15:43:23 -05:00
Erik Johnson
0fe8d61b2e Raise exception when pillar data is non-dict 
This adds some checks to the pillar data passed into the functions in
the state execution module, which raise a SaltInvocationError when the
pillar data is not a dictionary.

It also adds the ability to pass pillar data to state.top and
state.single, as this functionality was missing before.
 2014-03-23 15:36:11 -05:00
Erik Johnson
5ef65924e4 Override __outputter__ when functions trigger exceptions 
For module functions which have an outputter defined in an __outputter__
dict, the specified outputter is used when the function returns data to
the master. However, when an exception generates an error message, such
as when an exception is triggered, the nested outputter is desired.

This commit adds the ability to set an 'out' key in the dict of return
data passed to salt.minion.Minion._return_pub() which, if present,
overrides the outputter defined in the __outputter__ dict for that
function.
 2014-03-23 15:12:36 -05:00
Pedro Algarvio
4ad4f8af34 Merge pull request #11462 from terminalmage/non-string-args 
Properly handle non-string args
 2014-03-23 18:47:44 +00:00
Pedro Algarvio
27310d0ef9 Remove trailing white-space. 2014-03-23 18:43:56 +00:00
Pedro Algarvio
9ec00d2834 Fix wrong permissions 2014-03-23 18:22:35 +00:00
Pedro Algarvio
2c27ec8a8e Improve permissions check testcase. 2014-03-23 18:20:42 +00:00
Pedro Algarvio
ef6bd18784 Update with proper perms 2014-03-23 18:05:05 +00:00
Erik Johnson
ccb624df9b Properly handle non-string args 
This fixes arguments which came from a non-string (i.e. API) source.
This issue was introduced recently in pull request #11368.
 2014-03-23 13:04:01 -05:00
Erik Johnson
e10ad36296 Revert "fix cloud.lxc usage of kwargs which seem to have changed" 
This reverts commit a7f1508645.
 2014-03-23 13:03:47 -05:00
Pedro Algarvio
ca76e31ac9 Allow standalone execution 2014-03-23 16:58:40 +00:00
Pedro Algarvio
3f2f5f3f76 Reuse existing vars. Allow standalone execution. 2014-03-23 16:57:51 +00:00
Joseph Hall
09664b8b9b Merge pull request #11449 from xenuser/patch-1 
Update schedule.rst
 2014-03-23 10:29:37 -06:00
Pedro Algarvio
da634497ac Merge pull request #11457 from techhat/proxmox 
Linting and style cleanup in proxmox
 2014-03-23 16:16:06 +00:00
Joseph Hall
8af11f3897 Remove unneeded line 2014-03-23 08:50:42 -06:00
Joseph Hall
873d84cc0a Merge pull request #11458 from makinacorpus/hf2 
fix cloud.lxc usage of kwargs which seem to have changed
 2014-03-23 08:49:28 -06:00
Mathieu Le Marec - Pasquet
a7f1508645 fix cloud.lxc usage of kwargs which seem to have changed 2014-03-23 15:30:11 +01:00
Joseph Hall
e123bcdab6 Cleaning up merge conflict stuff 2014-03-23 08:11:05 -06:00
Joseph Hall
f309f885d0 Removing duplicate code 2014-03-23 08:05:14 -06:00
Joseph Hall
7aa0ca51ab Fix conflicts 2014-03-23 08:03:34 -06:00
Joseph Hall
f4b8743a37 Linting and style cleanup in proxmox 2014-03-23 08:00:41 -06:00
Joseph Hall
97b9ecd957 Linting and style cleanup in proxmox 2014-03-23 07:55:06 -06:00
Pedro Algarvio
ebf8c37b74 Merge pull request #11456 from JensRantil/bootstrap-cli-minid-opt 
Bootstrap script: Document new `-i` CLI option
 2014-03-23 13:54:45 +00:00
Joseph Hall
a837375fed Merge pull request #11455 from makinacorpus/hf1 
Fix proxmox setup killing saltcloud install
 2014-03-23 07:20:31 -06:00
Mathieu Le Marec - Pasquet
b7ca59e48a Fix proxmox setup killing saltcloud install 2014-03-23 14:15:43 +01:00
Jens Rantil
3c5ab353e1 doc(topic/bootstrap): document -i CLI option 
It was added in https://github.com/saltstack/salt-bootstrap/pull/348.
 2014-03-23 14:14:40 +01:00
Joseph Hall
f4535b4953 Merge pull request #11443 from syphernl/cloud/proxmox 
Proxmox support for Salt-Cloud
 2014-03-23 06:56:58 -06:00
Frank Klaassen
de149cc5ee Fix destroy function (missing ID parameter in URL) & replaced leftover prints with a log.error 2014-03-23 13:37:33 +01:00
Frank Klaassen
3d69b94124 Fixes after feedback: 
- Remove empty comment (was actually a divider just to separate the internal functions)
- Comment out config by default
- Removed unused imports urllib, urllib2
- Removed unused dependency (and import) of json
 2014-03-23 13:28:24 +01:00