schasi
cedbe92951
Fix index error when setting empty values
...
When setting empty values, the string returned by sysrc would be split in a way that would make the result a list containing just the delimiter " ->". This would then produce a failure when trying to select the second entry in the list.
2017-07-13 19:54:25 +02:00
Mircea Ulinic
b2ba9049af
test.get_opts runner function, similar to the exec fun
2017-07-12 23:04:24 +00:00
Mike Place
cb030114ec
Merge branch 'develop' into profitbricks_fixes
2017-07-12 16:33:50 -05:00
Nicole Thomas
38a67d7648
Merge pull request #42281 from SaltyCharles/patch-7
...
fix typo
2017-07-12 15:27:15 -06:00
Mike Place
a668b2994a
Merge pull request #42268 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-07-12 15:11:00 -05:00
Mike Place
5f17cd7b83
Merge pull request #42271 from CorvinM/issue42225
...
Add batch_wait support for Python API
2017-07-12 15:08:53 -05:00
Federico Pires
bb37ed287b
Warning should be until Neon, not Oxygen
2017-07-12 17:07:58 -03:00
Federico Pires
e68c7caaa2
Merge branch 'issue_42162_route53boto' of https://github.com/fpires82/salt into issue_42162_route53boto
2017-07-12 17:04:26 -03:00
Federico Pires
01535b1ac6
Merge remote-tracking branch 'upstream/develop' into issue_42162_route53boto
2017-07-12 17:02:47 -03:00
Federico Pires
c1f5dd7a7b
Deprecation warning for retry_on_rate_limit and rate_limit_retries args
2017-07-12 17:01:43 -03:00
SaltyCharles
2ff1d814b2
fix typo
2017-07-12 12:26:53 -07:00
Jasper Lievisse Adriaanse
acbc7dacf5
Merge branch 'develop' into openbsd_kvm
2017-07-12 19:28:30 +02:00
Jasper Lievisse Adriaanse
c9eade574c
Extend resolution of 'virtual' grain for OpenBSD on KVM.
2017-07-12 19:27:46 +02:00
twangboy
ed89cd0b93
Use os.sep for path seps
2017-07-12 10:13:26 -06:00
Nicole Thomas
a14dbc660c
Merge branch 'develop' into decorator_fixes-gh
2017-07-12 10:03:07 -06:00
Andrew Pashkin
7d59f7a6c6
Make possible to reference pillars, that come before current pillar in the top file
2017-07-12 19:03:05 +03:00
Nicole Thomas
63718024fd
Merge branch 'develop' into jinja_globals_gh
2017-07-12 10:02:42 -06:00
Andrew Pashkin
e2cc3e1acf
Factor out pillar merging in salt.pillar.Pillar into a separate helper method
2017-07-12 10:33:06 +03:00
Corvin Mcpherson
15693079e8
Add batch_wait support for Python API
...
Fixes #42225
2017-07-12 03:04:14 -04:00
Nicole Thomas
5f01dccf8f
Merge pull request #42214 from gtmanfred/develop
...
allow not verifying ssl winrm saltcloud
2017-07-11 17:33:21 -06:00
rallytime
1a62d2fe70
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/cloud/libcloudfuncs.py
2017-07-11 17:17:31 -06:00
rallytime
78cdee51d5
Gate boto_elb tests if proper version of moto isn't installed
...
For Python 2 tests, we can use an older version. But when running
these tests of Python 3, we need a newer version of moto that supports
Python 3.
This gates the tests if the expected version of moto is missing.
2017-07-11 17:00:50 -06:00
Nicole Thomas
b0f2427771
Merge branch 'develop' into issue_42162_route53boto
2017-07-11 15:37:10 -06:00
Nicole Thomas
ca74850933
Merge pull request #42248 from gtmanfred/gpg
...
fix signature versionadded release
2017-07-11 14:48:04 -06:00
twangboy
55b278c478
Mock the reg.read_value function
2017-07-11 13:23:11 -06:00
twangboy
45be32666a
Add error-handling function to shutil.rmtree
2017-07-11 13:08:00 -06:00
garethgreenaway
24905ff5d8
Merge pull request #42249 from rallytime/docstring-fix
...
Add get_driver function used with libcloud modules to doc exception list
2017-07-11 11:07:04 -07:00
Ethan Devenport
65e132f071
Provide better error message when datacenter is not found.
...
Corrected property name in documentation.
Updated library version dependency.
2017-07-11 17:40:05 +00:00
Daniel Wallace
3fb1b8e596
Merge branch 'develop' into gpg
2017-07-11 10:59:30 -06:00
Berthet
eabb17665f
Merge branch 'develop' into vberthet-xen-ignore-ssl
2017-07-11 18:35:03 +02:00
Berthet
b779cae19f
Fix Lint error
2017-07-11 18:34:30 +02:00
garethgreenaway
7d50e4c077
Merge branch 'develop' into patch-6
2017-07-11 09:23:32 -07:00
Daniel Wallace
593ccedc00
fix signature versionadded release
2017-07-11 09:27:50 -06:00
rallytime
7e0c099ab3
Add get_driver function used with libcloud modules to doc exception list
...
Fixes failing valid_docs test in develop
2017-07-11 09:13:38 -06:00
Nicole Thomas
827347bcf3
Merge pull request #42229 from shengis/add_dns_for_azurearm
...
add custom dns support for azurearm provider
2017-07-11 09:08:45 -06:00
Mircea Ulinic
1ac69bd737
Document the provider option and rearrange the doc
2017-07-11 14:44:51 +00:00
Alexandru Bleotu
346b1880e3
Merge branch 'develop' into jinja_globals_gh
2017-07-11 10:33:06 +01:00
shengis
e95316b145
Merge branch 'develop' into add_dns_for_azurearm
2017-07-10 23:01:52 +02:00
Aurelien Fusil-Delahaye
8f96b45833
fix using isinstance
2017-07-10 22:58:21 +02:00
Mircea Ulinic
4bf4b14161
New option for napalm proxy/minion: provider
...
This option will turn very handy for environemnts when the user
requires a library with a different name than napalm-base (eventually
on top of the public lib). The sole requirement right now is to
preserve the get_network_driver function. However, this can be enhnaced
even from this perspective later, if really needed.
2017-07-10 20:29:35 +00:00
garethgreenaway
81695a9f3c
Merge pull request #42234 from Ch3LL/fix_cloud_rc
...
[2017.7] parse libcloud rc version correctly
2017-07-10 11:58:55 -07:00
Nicole Thomas
a94b7ce72c
Merge branch 'develop' into patch-6
2017-07-10 11:56:29 -06:00
Nicole Thomas
c554ab2a5b
Merge pull request #42224 from tdutrion/develop
...
Remove duplicate instruction in Openstack Rackspace config example
2017-07-10 11:02:31 -06:00
Ch3LL
5aedac46b7
[2017.7] parse libcloud rc version correctly
2017-07-10 12:37:22 -04:00
Aurélien FUSIL-DELAHAYE
e37097b802
spaces removed for lint
2017-07-10 16:08:19 +02:00
Aurélien FUSIL-DELAHAYE
340368fdac
add custom dns support for azurearm provider
...
- added option in documentation : dns_servers
2017-07-10 13:35:08 +02:00
Thomas Dutrion
6144af034a
Remove duplicate instruction in Openstack Rackspace config example
2017-07-09 11:34:14 +02:00
Nicole Thomas
3451da9437
Merge pull request #42201 from shengis/add_cloud_event_for_azurearm
...
add destroying and destroy cloud events to azurearm provider
2017-07-07 15:34:44 -06:00
Nicole Thomas
5337581328
Lint: Remove extra spaces between name and }
2017-07-07 14:23:14 -06:00
Daniel Wallace
ce6b05d237
add release note
2017-07-07 13:15:30 -06:00
