Commit Graph

57100 Commits

Author SHA1 Message Date
rallytime
a3b673cfca Pylint fix 2015-08-11 09:23:28 -06:00
rallytime
14fe0b88af Add more unit tests to the OpenNebula driver 2015-08-10 17:15:38 -06:00
Justin Findlay
4f4bbd5261 Merge pull request #26184 from loa/docker-py-auto-detect-version-dockerng
Let docker-py auto detect version if not defined by user
2015-08-10 13:03:03 -06:00
Carl Loa Odin
a9eea45d89 Let docker-py auto detect version if not defined by user
Docker-py will auto detect docker version incase version 'auto' is used.
Reference: docker/docker-py#673
2015-08-10 19:35:16 +02:00
Nicole Thomas
336bc3ce66 Merge pull request #26147 from martinhoefling/develop
Fixes #26024
2015-08-10 10:44:58 -06:00
Nicole Thomas
f019214245 Merge pull request #26163 from nmadhok/cloud-fix-26162
Make sure variable is a dictionary before popping something from it.
2015-08-10 10:24:19 -06:00
Nicole Thomas
d0ef023d72 Merge pull request #26165 from nmadhok/cloud-fix-26164
clonefrom argument should be mandatory instead of image argument for vmware cloud driver.
2015-08-10 10:22:43 -06:00
Nicole Thomas
ee2f4d5b3f Merge pull request #26144 from nmadhok/vmware-cloud-fixes-develop
VMware cloud driver fixes [forward port from 2015.5 into develop]
2015-08-10 10:18:31 -06:00
Mike Place
79ce2880f7 Merge pull request #26160 from silenius/issue26155
proposed fix for #26155
2015-08-10 10:12:39 -06:00
Mike Place
c02adba640 Merge pull request #26138 from evverx/tz-fix
Check the tzname before the tzfiles hashsums
2015-08-10 08:47:29 -06:00
Mike Place
f68d612344 Merge pull request #26154 from loa/docker-py-auto-detect-version
Let docker-py auto detect version if not defined by user
2015-08-10 08:44:52 -06:00
Mike Place
3e79f6e79d Merge pull request #26167 from cachedout/lint_26157
Lint #26157
2015-08-10 08:35:55 -06:00
Mike Place
a39eaa265a Lint #26157 2015-08-10 08:35:20 -06:00
Mike Place
eaa759c2f5 Merge pull request #26157 from bradthurber/module_hashutil_docs_missing_escape_char
hashutil python docs are missing escape chars and some lines are too …
2015-08-10 08:34:40 -06:00
Justin Findlay
bf59d7a648 Merge pull request #26153 from loa/fix-dockerio-documentation-typo
Fix dockerio state documentation typo
2015-08-10 08:26:51 -06:00
Julien Cigar
bae203d92b No logging should happen on __virtual__ 2015-08-10 16:10:46 +02:00
Nitin Madhok
9a3fd9b989 image argument not mandatory for vmware cloud driver. Fixes #26164 2015-08-10 09:56:05 -04:00
Nitin Madhok
d566e19df4 Make sure variable is a dictionary before popping something from it. Fixes #26162 2015-08-10 09:41:44 -04:00
Julien Cigar
03b966f6c6 proposed fix for #26155 2015-08-10 15:00:07 +02:00
Brad Thurber
c709adb7e2 hashutil python docs are missing escape chars and some lines are too long. 2015-08-10 07:45:43 -04:00
Carl Loa Odin
3f1f2d195d Let docker-py auto detect version if not defined by user
Docker-py will auto detect docker version incase version 'auto' is used.
Reference: docker/docker-py#673
2015-08-10 10:17:59 +02:00
Carl Loa Odin
78ecfcdd97 Fix dockerio state documentation typo 2015-08-10 10:01:20 +02:00
Martin Hoefling
8ee82cafb3 Fixes #26024 2015-08-09 23:18:22 +02:00
Nitin Madhok
8899950564 Correct provider name in profile example 2015-08-09 11:48:31 -04:00
Nitin Madhok
2e3a14d02c Change all provider references to driver 2015-08-09 11:43:04 -04:00
Nitin Madhok
8c949a8ae8 backwards compatibility fix for mac_address 2015-08-09 11:36:53 -04:00
Nitin Madhok
16e04f3862 Lint fix 2015-08-09 07:41:21 -04:00
Nitin Madhok
e5f9a13045 VMware cloud driver fixes 2015-08-09 07:39:13 -04:00
Evgeny Vereshchagin
694ba4d0c6 Check the tzname before the tzfiles hashsums
Fix #12654, #24964
2015-08-09 07:24:18 +03:00
Thomas S Hatch
3d04960e71 Merge pull request #26134 from thatch45/pchanges2
Pchanges2
2015-08-08 21:04:34 -06:00
Thomas S Hatch
8ea399dc76 Merge pull request #26120 from rallytime/one-remove-script-func
Remove script func from OpenNebula driver - it's obsolete b/c of salt.utils.bootstrap
2015-08-08 20:20:22 -06:00
Thomas S Hatch
2ddf5c4e58 lint 2015-08-08 20:17:45 -06:00
Mike Place
7f1af0474a Merge pull request #25622 from steverweber/fix_max_ip_wait_time
add wait_for_ip_timeout
2015-08-08 19:31:32 -06:00
C. R. Oldham
8b89e46f53 Merge pull request #26118 from rallytime/one-testing
Wrote even more unit tests for the OpenNebula driver
2015-08-08 15:11:39 -06:00
Thomas S Hatch
912d6041f5 apply @cachedout's tests 2015-08-08 09:37:16 -06:00
Thomas S Hatch
0e705d2185 add pchanges docs 2015-08-08 09:32:29 -06:00
Thomas S Hatch
cbd9590dcb pchanges to file 2015-08-08 09:29:39 -06:00
rallytime
7716fb4ba2 Remove script func - it's obsolete b/c of salt.utils.bootstrap 2015-08-07 16:59:03 -06:00
rallytime
8ae98b2bf4 Remaining template_* unit tests for OpenNebula 2015-08-07 16:34:05 -06:00
rallytime
fa58787227 Unit tests for vn_* functions for the OpenNebual driver 2015-08-07 16:10:55 -06:00
rallytime
7855a388e3 Wrote more unit tests for the OpenNebula driver
Also fixed a couple of minor bugs found along the way.
2015-08-07 15:12:04 -06:00
Mike Place
bbc6f84c75 Merge pull request #26105 from cachedout/fix_25221
Fix failing test
2015-08-07 12:11:10 -06:00
Mike Place
1a18013330 Fix failing test 2015-08-07 12:10:40 -06:00
Mike Place
c5e1f5bee6 Merge pull request #25221 from jet9/istextfile_utf8
Extend salt.utils.istextfile() with detection of utf-8 content instead of binary
2015-08-07 12:10:27 -06:00
Nicole Thomas
2aaf1b0d8a Merge pull request #26104 from rallytime/pylint-25984
Pylint fix for #25984
2015-08-07 11:09:38 -06:00
rallytime
b5d78c572e Pylint fix for #25984
Refs #25984
2015-08-07 11:08:41 -06:00
Mike Place
8603337552 Merge pull request #25984 from jmdcal/bugfix1
Support local files without md5sum
2015-08-07 09:27:17 -06:00
Mike Place
a8b95efa46 Merge pull request #26095 from silenius/virtualenv_mod
no_use_wheel is missing in virtualenv_mod, fix it
2015-08-07 09:05:36 -06:00
Mike Place
ce5b1b853f Merge pull request #25975 from mecarus/develop
Resolve ensure_index deprecation warnings, change get_options usernam…
2015-08-07 08:58:39 -06:00
Julien Cigar
1defcf360e as requested, move the param to the end of the list 2015-08-07 16:56:44 +02:00