valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
48,584 Commits 24 Branches 182 Tags 341 MiB
02a597bf49
Commit Graph

48584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
eafa20cdfb Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-06-04 15:48:35 -06:00
Thomas S Hatch
83f853b6ea Merge pull request #24405 from jacksontj/2014.7 
Fix for #24276
 2015-06-04 14:50:42 -06:00
Justin Anderson
cdffc02cfe Merge pull request #24408 from rallytime/bp-24392 
Backport #24392 to 2015.5
 2015-06-04 14:22:09 -06:00
Justin Anderson
a6a1f87cd9 Merge pull request #24380 from rallytime/bp-24357 
Backport #24357 to 2015.5
 2015-06-04 14:13:51 -06:00
Thomas S Hatch
cef919c602 Merge pull request #24395 from hvnsweeting/handle-exception-get-file 
handle exceptions when received data is not in good shape
 2015-06-04 14:08:22 -06:00
Thomas S Hatch
86ce9dbbdf Merge pull request #24388 from pengyao/sshclient-kwargs 
fixes #24358
 2015-06-04 14:07:40 -06:00
Thomas S Hatch
72d2eaeda9 Merge pull request #24367 from terminalmage/issue22958 
Improve error message when module does not exist
 2015-06-04 14:07:12 -06:00
Thomas S Hatch
a628778e3c Merge pull request #24412 from jfindlay/bp-23387 
backport #23387
 2015-06-04 14:06:03 -06:00
Justin Anderson
485116c2cc Merge pull request #24336 from twangboy/fix_cp_get_url 
Added line to give more descriptive error
 2015-06-04 13:56:00 -06:00
Nicole Thomas
b3d39cc0e8 Merge pull request #24413 from techhat/gogridnamespace 
Add more namespaced functions to GoGrid driver
 2015-06-04 13:51:21 -06:00
Justin Anderson
efba1a94b4 Merge pull request #24305 from twangboy/win_path_docs 
Added documentation, fixed formatting
 2015-06-04 13:40:54 -06:00
Colton Myers
27f109bd76 Merge pull request #24399 from makinacorpus/versionvirtual 
Versionvirtual
 2015-06-04 12:02:22 -06:00
Joseph Hall
1b397cb6fe Adding blank line 2015-06-04 11:54:58 -06:00
Joseph Hall
da08cc9aac Add more namespaced functions to GoGrid driver 2015-06-04 11:52:53 -06:00
rallytime
bf85772042 Make sure the parameters are in the correct order 2015-06-04 11:39:39 -06:00
rallytime
9f53809cde Add "* Change" label parameters 2015-06-04 11:39:39 -06:00
rallytime
b27a15e774 Remove "workaround" wording 2015-06-04 11:39:39 -06:00
rallytime
9fff35a959 Some small fixes 2015-06-04 11:39:39 -06:00
rallytime
54a7089fd6 Link the new labels doc in contributing and hacking docs 2015-06-04 11:39:39 -06:00
rallytime
375695e696 Add pull request label definitions 2015-06-04 11:39:39 -06:00
rallytime
de945638d3 Add Feature Request label definition 2015-06-04 11:39:39 -06:00
rallytime
684f291bd4 Add issue definition and augment functional areas section 2015-06-04 11:39:39 -06:00
rallytime
2da13dd525 Start a "what are all of these labels for?" doc 2015-06-04 11:39:38 -06:00
Devin Christensen
ff7461b3cd Use path found by salt.utils.which 
I ran into this problem running `salt-ssh '*' test.ping` with a
XenServer 6.5 node as the target. Even though the `lspci` and
`dmidecode` (after I installed it) commands are found by
`salt.utils.which`, because they're not actually in the `$PATH`, they
fail to execute.
 2015-06-04 09:49:43 -06:00
Thomas Jackson
2c7afaeebf Fix for #24276 
poller.poll ends up calling the poll system call under the hood. If the process which called poll() gets a signal it will raise `ZMQError: Interrupted system call` which we should catch and move continue.
 2015-06-04 08:28:16 -07:00
Justin Findlay
deaee68b89 Merge pull request #24371 from joejulian/2015.5_tls_module_tests 
2015.5 tls module tests
 2015-06-04 09:20:16 -06:00
Justin Findlay
84686ee695 Merge pull request #24403 from jayeshka/process_states-unit-test 
adding states/process unit test case.
 2015-06-04 09:19:01 -06:00
Justin Findlay
35de8d72db Merge pull request #24402 from jayeshka/pyenv_states-unit-test 
adding states/pyenv unit test case.
 2015-06-04 09:18:11 -06:00
Justin Findlay
632f838838 Merge pull request #24401 from jayeshka/powerpath-states-unit-test 
adding states/powerpath unit test case.
 2015-06-04 09:17:46 -06:00
Justin Findlay
0a6e5e0d96 Merge pull request #24400 from makinacorpus/aptversion 
Aptversion
 2015-06-04 09:17:19 -06:00
Justin Findlay
a904055d28 Merge pull request #24385 from jeanpralo/Fix-binds-dockerio.start 
Fix salt.modules.dockerio.start method
 2015-06-04 09:00:22 -06:00
Justin Findlay
9890bc4e43 Merge pull request #24381 from jtand/seed_test 
Disabled flaky test to review later
 2015-06-04 08:57:43 -06:00
Nicole Thomas
b3fa8fefcb Merge pull request #24382 from basepi/grainscommandnotfound23342 
[2015.5] Handle CommandExecutionError in grains commands, Fixes #23342
 2015-06-04 06:44:03 -06:00
Nicole Thomas
52587a4fc1 Merge pull request #24379 from Starblade42/2015.5 
Fixes an issue where Pagerduty states/modules couldn't find their profile in the Pillar
 2015-06-04 06:41:13 -06:00
Jayesh Kariya
5f263ab48b adding states/pyenc unit test case. 2015-06-04 17:50:04 +05:30
Jayesh Kariya
fcb71fb35e adding states/process unit test case. 2015-06-04 17:49:04 +05:30
Jayesh Kariya
49ff9272ce adding states/powerpath unit test case. 2015-06-04 17:47:39 +05:30
Mathieu Le Marec - Pasquet
e15cb936b5 Use apt_pkg.version_compare if available 
This fixes #24397

Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-06-04 14:05:35 +02:00
Mathieu Le Marec - Pasquet
953725a563 Fix too much quoting in apt.version_cmp 
This refs #24397

Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-06-04 14:05:35 +02:00
Mathieu Le Marec - Pasquet
235c78ddfe Use apt_pkg.version_compare if available 
This refs #24397

Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-06-04 14:00:15 +02:00
Mathieu Le Marec - Pasquet
1c0cd459f8 reindent block to isolate conflict on merge forward 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-06-04 13:59:46 +02:00
Mathieu Le Marec - Pasquet
699eceab64 use var to isolate conflict on merge forward 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-06-04 13:52:10 +02:00
Viet Hung Nguyen
bb798a0224 handle exceptions when received data is not in good shape 2015-06-04 17:26:32 +07:00
pengyao
5c08ca48b4 fixes #24358 2015-06-04 12:09:28 +08:00
Jean Praloran
a0fed313fa binds dict if not specified should remain to none otherwise docker-py will try to create a new host config and all volume and ports binds are lost. config should be done at the creation of the container not when we start it 2015-06-04 14:20:10 +12:00
Starblade42
b93dc5ef6c Linting! 2015-06-03 17:28:33 -06:00
Colton Myers
85b91d64cc Handle CommandExecutionError in grains commands 
Since we switched to python_shell=False, commands throw exceptions
when not found, rather than just having a non-zero retcode (since
we're not using a shell). Catch these exceptions and handle them the
same way as non-zero retcodes.
 2015-06-03 16:45:16 -06:00
zhujinhe
f08c875015 fix invoke issues of Jinja Macros example 
1.'php_ini' not defined in /srv/pillar/php.sls, {{ salt.pillar.get('php_ini', {}) | json() }} gets empty value.
2.no section defined, should be 'section_name'.
3.remove empty line.
 2015-06-03 16:38:16 -06:00
Justin
7570ae9132 Disabled flaky test to review later 2015-06-03 16:27:33 -06:00
Joe Julian
4c5dee1e25 Add @destructiveTest decorator to destructive tests 2015-06-03 15:27:05 -07:00