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
54,328 Commits 24 Branches 182 Tags 341 MiB
de7fe49830
Commit Graph

54328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joseph Hall
ca2b7320bb Merge pull request #24404 from edouardb/scaleway-provider-doc 
Add Getting Started for Scaleway provider
 2015-06-04 09:33:38 -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
76b54fc886 Merge pull request #24393 from dr4Ke/fix_grains.set_preserve_list_order 
Fix grains.set preserve list order
 2015-06-04 09:10:19 -06:00
Justin Findlay
a5d14ec78a Merge pull request #24392 from quixoten/use_found_cmd_path 
Fix "No such file or directory" in grains/core.py
 2015-06-04 09:08:06 -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
ddc167907f Merge pull request #24335 from nmadhok/patch-cloud 
Only pop the key if the key exists otherwise do nothing
 2015-06-04 08:47:58 -06:00
Edouard Bonlieu
908b27869d Add Getting Started for Scaleway provider 2015-06-04 16:23:06 +02: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
Christophe Drevet-Droguet
c902cb7f51 module function grains.set: fix preserve list order 2015-06-04 09:57:29 +02:00
Christophe Drevet-Droguet
7b9451451f module grains tests: test list order preservation 2015-06-04 09:52:09 +02:00
Devin Christensen
b69e0cf710 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 01:29:29 -06: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
Justin Findlay
c40e5d8d12 Merge pull request #24377 from lyft/boto-kms-docs 
Add boto_kms docs
 2015-06-03 17:03:34 -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
Nicole Thomas
f9f16de77e Merge pull request #23620 from lyft/boto-util-get-error-fix 
Make boto util get_error function compatible with newer boto modules
 2015-06-03 16:34:35 -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
Ryan Lane
a3924bba0e Add boto_kms docs 2015-06-03 15:18:52 -07:00
Starblade42
2dd5904119 Fixes an issue where Pagerduty states/modules couldn't find it's profile in the Pillar 
The pagerduty state currently only works if the pagerduty profile is set
up in the minion config or the master config (if using the pagerduty
runner). This just makes it so it will also look in the pillar for the
specified profile name.
 2015-06-03 16:17:04 -06:00
Justin Findlay
3ca35d1ec3 Merge pull request #24366 from terminalmage/pecl-yes 
Use yes $'\n' instead of printf '\n' for pecl commands
 2015-06-03 15:28:58 -06:00
Colton Myers
6c84fa03a0 Merge pull request #24373 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-06-03 15:19:45 -06:00
Justin Findlay
1e0f247447 Merge pull request #24357 from zhujinhe/develop 
fix invoke issues of Jinja Macros example
 2015-06-03 15:06:30 -06:00
Justin Findlay
5cbebf6832 Merge pull request #24353 from cetra3/file-copy-force-fix 
Set changed = true if the file has changed when using file.copy state
 2015-06-03 14:38:54 -06:00
Colton Myers
c41d9f4ae2 Reformat lxc.py and fix a bad merge conflict resolution 2015-06-03 13:52:52 -06:00
Colton Myers
baf4337918 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/modules/lxc.py
    salt/roster/clustershell.py
 2015-06-03 13:47:08 -06:00
Colton Myers
86a3b317c6 Merge pull request #24348 from makinacorpus/lxcpre 
Try to close input pipes before calling lxc-start
 2015-06-03 13:38:07 -06:00
Justin Findlay
d71d75e2ec Merge pull request #24372 from rallytime/release_notes 
Add 2015.5.2 release notes
 2015-06-03 13:30:45 -06:00
rallytime
f5ec1a1693 Add 2015.5.2 release notes 2015-06-03 13:27:17 -06:00
Justin Findlay
76927c9ea1 Merge pull request #24346 from rallytime/bp-24271 
Backport #24271 to 2015.5
 2015-06-03 12:44:31 -06:00
Justin Findlay
4afa03d8e3 Merge pull request #24345 from rallytime/bp-24013 
Backport #24013 to 2015.5
 2015-06-03 12:39:41 -06:00
Mathieu Le Marec - Pasquet
0cb11a2767 lxc: typo 2015-06-03 20:18:56 +02:00