Justin Findlay
41dd3307dc
fix ddns_test for py26, broken for py3
...
The way to fix this for py26+py3 compatibility is probably to create a
wrapper for contextlib.nested in something like
salt.utils.contextlib.nested or salt.utils.py3_compat.contextlib.nested.
2015-01-27 14:32:29 -07:00
Mike Place
2fc1452be6
Merge pull request #20125 from cachedout/pydsl_copy
...
Avoid file cache problem in pydsl tests
2015-01-27 14:32:21 -07:00
Mike Place
dc538853c6
Avoid file cache problem in pydsl tests
...
Using the same copy of opts was causing the cache refresh to not find
any files because they had already been cleaned up!
2015-01-27 14:30:56 -07:00
Thomas S Hatch
9ba6d44be9
Merge pull request #20121 from cvrebert/patch-2
...
grains.ssds: rm redundant import
2015-01-27 14:24:04 -07:00
Joseph Hall
d783dd2358
Merge pull request #20117 from cvrebert/patch-1
...
utils.verify.verify_env(): fix "defulats" typo
2015-01-27 14:19:33 -07:00
Chris Rebert
c3b1725268
grains.ssds: rm redundant import
...
************* Module salt.grains.ssds
salt/grains/ssds.py:13: [W0404(reimported), ] Reimport 'salt.utils' (imported line 9)
2015-01-27 13:13:44 -08:00
Chris Rebert
55325d52ba
utils.verify.verify_env(): fix "defulats" typo
...
************* Module salt.utils.verify
salt/utils/verify.py:202: [E1101(no-member), verify_env] Module 'salt' has no 'defulats' member
2015-01-27 13:05:26 -08:00
Joseph Hall
b96b852aa1
Merge pull request #20115 from TaiSHiNet/patch-1
...
DO APIv1 issue Closes #19306
2015-01-27 13:18:38 -07:00
TaiSHiNet
19af3303e3
DO APIv1 issue Closes #19306
...
Cast backups_enabled/private_networking booleans to lowercase string, given that DO APIv1 will not recognize True with capitol T
All credits to @namcois, I merely edited the file
2015-01-27 16:38:02 -03:00
Thomas S Hatch
6bb744c067
Merge pull request #20104 from rupeshta/junos_unit_tests
...
implemented unit test cases for junos module
2015-01-27 10:37:55 -07:00
Thomas S Hatch
6e43cfa816
Merge pull request #20103 from rupeshta/ipset_unit_tests
...
implemented unit test cases for ipset module
2015-01-27 10:37:47 -07:00
Thomas S Hatch
f7f4966420
Merge pull request #20073 from cachedout/gpg_test
...
GPG test fix
2015-01-27 10:31:34 -07:00
Thomas S Hatch
bf397d12b3
Merge pull request #20094 from basepi/merge-forward-develop
...
Merge forward from 2015.2 to develop
2015-01-27 10:04:51 -07:00
Thomas S Hatch
4ab2489bbb
Merge pull request #20062 from cachedout/test_runner_timeout
...
Increae default runner timeout to 60s
2015-01-27 09:54:54 -07:00
Thomas S Hatch
14b23cf7db
Merge pull request #19950 from jayeshka/debian_ip-unit-test
...
adding unit test case for debian_ip
2015-01-27 09:53:58 -07:00
Rupesh Tare
db0d10f453
implemented unit test cases for junos module
2015-01-27 18:46:07 +05:30
Rupesh Tare
6b8eb2afe1
implemented unit test cases for ipset module
2015-01-27 18:44:13 +05:30
Jayesh Kariya
229a35be08
resolved the errors
2015-01-27 14:39:42 +05:30
Colton Myers
808b9b0e27
Revise mixins
2015-01-26 20:59:53 -07:00
Thomas S Hatch
e166f006a7
Merge pull request #20095 from colincoghill/develop
...
Handle pkgrepo keyids that have been converted to int. #19737
2015-01-26 20:42:02 -07:00
Thomas S Hatch
9791243c87
Merge pull request #20081 from lyft/fix-boto-asg-cloud-config
...
Recursively generate yaml for boto_asg cloud-config
2015-01-26 20:40:03 -07:00
Thomas S Hatch
e5c51442d1
Merge pull request #20064 from jfindlay/fix_ddns_tests
...
fix ddns tests
2015-01-26 20:36:37 -07:00
Colin Coghill
36671c65dd
Handle pkgrepo keyids that have been converted to int. #19737
2015-01-27 16:04:05 +13:00
Colton Myers
c4da7bdd64
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/client/mixins.py
salt/daemons/flo/__init__.py
2015-01-26 19:44:59 -07:00
Mike Place
6660c8b27c
Catch constructor errors in gpg
2015-01-26 16:55:14 -07:00
Justin Findlay
89d27d3054
refactor ddns_test test_update
2015-01-26 15:58:59 -07:00
Thomas S Hatch
7792b57cd0
Merge pull request #20054 from Unity-Technologies/develop
...
Fix checking of active mounts on OS X
2015-01-26 15:39:21 -07:00
Thomas S Hatch
80e71bc425
Merge pull request #20052 from hobakill/develop
...
adding the salt-api binary to the list of dependency requirements
2015-01-26 15:38:39 -07:00
Thomas S Hatch
d64c2258f6
Merge pull request #20042 from jodv/fix-relpath-daemonized-minion
...
Allow relative paths for --config-dir with daemonized minions
2015-01-26 15:30:50 -07:00
Colton Myers
1371f4be6f
Merge pull request #20084 from basepi/outputtererror20077
...
Default to nested for outputter of '' [2015.2]
2015-01-26 15:26:37 -07:00
Thomas S Hatch
11ae0173a9
Merge pull request #20057 from basepi/merge-forward-2015.2
...
Merge forward from 2014.7 to 2015.2
2015-01-26 15:26:23 -07:00
Thomas S Hatch
9b4840c965
Merge pull request #20083 from basepi/outputtererror20077
...
Default to nested for outputter of ''
2015-01-26 15:21:27 -07:00
Colton Myers
da6d25e13c
Default to nested for outputter of ''
...
Fixes #20077
2015-01-26 15:15:20 -07:00
Ryan Lane
3acc6b6344
Recursively generate yaml for boto_asg cloud-config
2015-01-26 14:01:19 -08:00
Mike Place
e3bf4bb6ee
GPG test fix
...
Now with 100% fewer race conditions
2015-01-26 14:12:35 -07:00
Justin Findlay
f0573670f9
fix skipIf logic for DDNSTestCase
2015-01-26 13:17:12 -07:00
Justin Findlay
bf24db2d69
fix ddns tests
2015-01-26 12:49:45 -07:00
Colton Myers
b201f1353c
is None
2015-01-26 12:45:14 -07:00
Thomas S Hatch
bfc6ead3b0
Merge pull request #20039 from bechtoldt/doc_various_fixes
...
completing some doc references
2015-01-26 12:15:38 -07:00
Thomas S Hatch
5cc9a7c249
Merge pull request #20037 from bechtoldt/fix_19262
...
add missing file_tree and virtkey in pillar index doc, refs #19262
2015-01-26 12:15:02 -07:00
Thomas S Hatch
ad32a7c966
Merge pull request #20035 from hazaelsan/fix_20034
...
Fix valid ipv6 netmask values in debian_ip.py.
2015-01-26 12:14:47 -07:00
Thomas S Hatch
d3cb66ebbc
Merge pull request #20032 from cachedout/remove_beta
...
The docker state is not in beta
2015-01-26 12:14:35 -07:00
Thomas S Hatch
f1dd8a98e6
Merge pull request #20031 from cachedout/error_to_warning
...
Change misleading error message
2015-01-26 12:13:26 -07:00
Thomas S Hatch
0365409a98
Merge pull request #20029 from bechtoldt/pkg_runner
...
Add pkg runner, list available pkg upgrades and group by packages
2015-01-26 12:13:12 -07:00
Thomas S Hatch
9567d744f2
Merge pull request #19622 from s0undt3ch/hotfix/lithium-deprecations
...
[2015.2] lithium deprecations
2015-01-26 12:08:48 -07:00
Nicole Thomas
645bab904b
Merge pull request #20058 from rallytime/pylint
...
Fix pylint on develop
2015-01-26 11:54:02 -07:00
Nick Hobart
80b7787e29
changing verbage from 'binary' to 'package'
2015-01-26 12:52:32 -06:00
Nick Hobart
c25601d754
fixing the syntax as per whiteinge comment
2015-01-26 12:26:32 -06:00
Mike Place
0b38efaaad
Increae default runner timeout to 60s
2015-01-26 10:59:55 -07:00
Mike Place
61f8a9c78c
Merge pull request #20059 from cachedout/pydsl_nuclear
...
Forcefully reset the highstate stack on each pydsl test
2015-01-26 10:46:49 -07:00
