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
62,450 Commits 24 Branches 182 Tags 341 MiB
7b11eb0d67
Commit Graph

6034 Commits

Author SHA1 Message Date
Mike Place
7b11eb0d67 Fixup test for #29321 2015-12-02 10:45:01 -07:00
Justin Findlay
60bd5781ef Merge pull request #29312 from sjmh/fix/etcd_watch_valerr 
Catch ValueError on timeout on non-existing key
 2015-12-01 13:55:41 -07:00
Steve Hajducko
cef6eff7c8 Catch ValueError on timeout on non-existing key 
The etcd watch function tries to read a key when it reaches the timeout
in order to obtain details about the key.

On python 2.6, when it tries to re-read the key, it throws a ValueError,
since python-etcd doesn't officially support python 2.6.  The watch
function wasn't catching this ValueError, so it was returning the
exception, rather than a blank dict.
 2015-12-01 10:30:45 -08:00
Mike Place
a890307cc0 Merge pull request #29310 from cachedout/fixup_spmverbose 
Fixup spmverbose
 2015-12-01 11:28:07 -07:00
Mike Place
cdde617be3 Fixup test for spm verbose PR 
Refs #29274
 2015-12-01 11:27:03 -07:00
Mike Place
7e424e10f2 Merge pull request #28054 from dr4Ke/custom_grains_deep_merge 
loader uses a deep dictionary merge for the grains (core and customs)
 2015-12-01 10:33:52 -07:00
Mike Place
84c36ec92f Merge pull request #29259 from Unity-Technologies/feature/beacon-adb 
Add beacon for android devices
 2015-11-30 15:30:18 -07:00
Mike Place
aa741b7015 Merge pull request #29176 from woodrow/elb-backend-policy-management 
Allow boto_elb to manage ELB backend policies.
 2015-11-30 13:36:44 -07:00
Daniel Hobley
24a3a98b3c Removed global in favour of updating a dictionary 2015-11-30 20:29:53 +01:00
Daniel Hobley
2690e3c8f3 Replaced double quotes with single 2015-11-30 20:19:13 +01:00
Jorge Schrauwen
cbded94f1a fix unit test (attempt 1) 2015-11-30 16:21:49 +00:00
Daniel Hobley
f482643959 Added beacon for detecting low battery on android devices 2015-11-27 14:03:05 +01:00
Mike Place
7bd15621c8 Merge pull request #29192 from bastiaanb/fix/issue-29191-subdict_match-regression 
fix issue 29191: only try partial matches when a wildcard has been sp…
 2015-11-25 13:06:39 -07:00
Mike Place
89aee406fa Merge pull request #29153 from DSRCompany/features/3077_acl_limit_args 
ACL limit args
 2015-11-25 10:29:35 -07:00
Bastiaan Bakker
7052479ad3 remove trailing whitespace 
fix subdict_match test cases
 2015-11-25 17:12:17 +01:00
Bastiaan Bakker
e3af8d2151 fix issue 29191: only try partial matches when a wildcard has been specified 2015-11-25 16:03:33 +01:00
Dmitry Kuzmenko
002b1ef9bd Fixed use of assert_has_calls in tests. 
The method logic was changed in mock-1.1.0.
This mades the use of the method compatible with both <1.1.0 and >=1.1.0
 2015-11-25 15:31:20 +03:00
Dmitry Kuzmenko
09c4f69402 ACL test fix. 2015-11-25 12:33:46 +03:00
Stephen Woodrow
c695a57ba9 Fix tests. 2015-11-24 18:09:12 -08:00
Colton Myers
28b40de8da Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/client/ssh/__init__.py
    salt/client/ssh/ssh_py_shim.py
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/vmware.py
    salt/grains/philips_hue.py
    salt/modules/boto_ec2.py
    salt/modules/boto_route53.py
    salt/modules/dracr.py
    salt/modules/philips_hue.py
    salt/proxy/philips_hue.py
    salt/states/virtualenv_mod.py
 2015-11-24 16:07:31 -07:00
Mike Place
68d6c454b8 Merge pull request #29141 from optix2000/full_sls_import 
Add test case for require: sls with only import statements
 2015-11-24 09:17:57 -07:00
Dmitry Kuzmenko
f20d2aa43e ACL test update and fixes 2015-11-24 17:35:17 +03:00
Dmitry Kuzmenko
de5890a346 ACL function args: test and fixes 2015-11-24 17:35:17 +03:00
Dmitry Kuzmenko
3b9c4d2b35 Fixed LoadAuthTestCase 2015-11-24 17:35:16 +03:00
Nicolas Delaby
e98d18ba41 Expose docker networking as state 2015-11-24 13:55:22 +01:00
Nicolas Delaby
17ff5c1ab5 Add expose networking to modules.dockerng 2015-11-24 13:55:22 +01:00
Weilu Jia
596843e8d6 Add test case for sls with only import 
Tests https://github.com/saltstack/salt/issues/10852
 2015-11-23 18:27:56 -08:00
Mike Place
b06f4b25cd Merge pull request #29054 from jtand/file_test 
Adjusted the expected output to match the actual results
 2015-11-20 08:51:33 -07:00
Christophe Drevet-Droguet
89e7578d21 loader test for external grains deep merge (non-functional) 
This test is disabled until we have a way to reload the minion, or
just the custom grains, with the grains_deep_merge option set.
 2015-11-20 08:44:29 +01:00
Mike Place
714ef8ff27 Merge pull request #29057 from lyft/file-manage-local-source-list 
Add local file support for file.managed source list
 2015-11-19 14:57:34 -07:00
Mike Place
30d0e7a0c2 Merge pull request #29008 from k00mi/develop 
Make systemd service state less slow
 2015-11-19 14:54:48 -07:00
justinta89
64a62662ef Added sys import 2015-11-19 14:42:15 -07:00
Justin Findlay
401e4bfd33 file state: integration test difflib version check 2015-11-19 14:10:29 -07:00
Justin Findlay
9a4959a42b systemd module: new unit test for available 2015-11-19 13:29:08 -07:00
Mike Place
b692ab1cfb Merge pull request #29047 from schwing/fix-gpg-exception 
Fix salt.modules.gpg.import_key exception: 'GPG_1_3_1 referenced before assignment'
 2015-11-19 12:07:36 -07:00
justinta89
f947e1e549 Adjusted the expected output to match the actual results 2015-11-19 11:32:18 -07:00
John Schwinghammer
813f6e6808 Fix 'GPG_1_3_1 referenced before assignment' 
- Fix gpg.import_key() exception:
    "local variable 'GPG_1_3_1' referenced before assignment"
- Update the unit tests to test both the gpg.GPG_1_3_1=True and
gpg.GPG_1_3_1=False cases.
 2015-11-19 09:27:46 -06:00
Mike Place
83e50d2515 Merge pull request #28906 from TronPaul/configparser-serializer 
Configparser serializer
 2015-11-18 19:42:52 -07:00
Paul Fisher
d175061c5d Add tests for file.source_list with local files 2015-11-18 15:55:44 -08:00
Justin Findlay
0c0bce3ea6 cache runner test: add new unit tests 2015-11-18 16:33:46 -07:00
Christophe Drevet-Droguet
f13e9435b1 loader test for custom grains 2015-11-18 22:08:24 +01:00
Mike Place
b386bfa59d Merge pull request #28952 from rominf/hg_status_multiple_repos 
[modules/hg] hg.status: multiple repositories
 2015-11-18 11:35:29 -07:00
Colton Myers
d76d62877d Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/modules/git.py
    salt/renderers/gpg.py
    salt/utils/__init__.py
 2015-11-17 16:24:43 -07:00
Mark McGuire
f0a60b33e2 Use changes in #28926 2015-11-17 10:54:19 -06:00
Mark McGuire
be2751885d Merge remote-tracking branch 'origin/develop' into configparser-serializer 2015-11-17 10:26:09 -06:00
Roman Inflianskas
ded2d46663 [modules/hg] hg.status: multiple repositories 2015-11-17 19:05:57 +03:00
Mike Place
1e9214f4e4 Merge pull request #28787 from chrigl/fix-28784 
closes #28784
 2015-11-17 08:54:04 -07:00
Mike Place
5b680c938a Merge pull request #28950 from DSRCompany/pr/28812_which 
PR 28812 which test fix
 2015-11-17 08:32:16 -07:00
Dmitry Kuzmenko
18571000c5 Fix which test in PR#28812 2015-11-17 11:29:41 +03:00
Christoph Glaubitz
8639e3e9c3 closes #28784 
In fact this test will fail on the current code, but that is like
intended. This tests the fix of #28783, which was introduced in 2015.5.
 2015-11-16 20:30:37 +01:00