Colton Myers
adcffc0af8
Move non-glance imports out of the try:except: block
2015-07-06 14:12:44 -06:00
rallytime
fe2561f415
Update moto version check in boto_vpc_test and update min version
...
Fixes #24272
2015-07-06 14:03:59 -06:00
Colton Myers
01ed062ca7
Merge pull request #25191 from basepi/fix.fileclient.is_cached
...
Add extrndest back to fileclient.is_cached in 2015.5
2015-07-06 13:35:24 -06:00
Justin Findlay
a9404aea5c
Merge pull request #25175 from rallytime/bp-25020
...
Back-port #25020 to 2015.5
2015-07-06 12:53:19 -06:00
Justin Findlay
c70fec65b8
Merge pull request #25173 from rallytime/partial-bp-25019
...
Partial back-port of #25019
2015-07-06 12:52:59 -06:00
Justin Findlay
c5ba9a90ba
Merge pull request #25171 from rallytime/bp-25001
...
Back-port #25001 to 2015.5
2015-07-06 12:51:53 -06:00
Colton Myers
5fa74f4408
Add back in the extrndest stuff (which is now in develop)
2015-07-06 12:07:34 -06:00
Colton Myers
785f1575e8
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/fileclient.py
salt/modules/glance.py
2015-07-06 12:03:11 -06:00
Pedro Algarvio
8aac9c92dc
Merge pull request #25172 from s0undt3ch/features/raas-17-salt-cloud-2015.8
...
Comment out imports while the YAML and RST rendering is not in-place.
2015-07-06 18:25:57 +01:00
rallytime
300a1f2711
Use linode status descriptions instead of ints when logging status to CLI.
2015-07-06 11:09:12 -06:00
David Boucha
65abb63003
remove some extraneous double spaces
2015-07-06 10:48:04 -06:00
David Boucha
c423b62aa5
fix misspelling
2015-07-06 10:46:18 -06:00
Nicole Thomas
3e06602545
Merge pull request #25170 from rallytime/bp-24982
...
Back-port #24982 to 2015.5
2015-07-06 10:34:43 -06:00
Stanislav Blokhin
1726057c8a
Use cmd_unzip to preserve permissions
2015-07-06 10:23:18 -06:00
Stanislav Blokhin
3ac35a5bff
Respect the test flag
2015-07-06 10:14:59 -06:00
Mike Place
a192ecfd74
Try to re-pack long ints as strs
...
Refs test failures in integration.states.file.FileTest.test_managed_contents
2015-07-06 10:11:55 -06:00
Malte Brodersen
64d8f14417
Update win_network.py
...
Typo (tab) fixed.
2015-07-06 10:09:50 -06:00
Malte Brodersen
6789c5b8e8
Update win_network.py
...
issue solved if dns is set to dhcp (compare to None)
2015-07-06 10:09:50 -06:00
Tom Melendez
4078c8db25
added message recommending JSON file be used if the libcloud version is >= 0.17.0
2015-07-06 10:07:16 -06:00
Wolodja Wentland
1eeefbd2ab
Add virtual functions to influxdb state modules
...
Fixes #24301
2015-07-06 10:03:04 -06:00
Martin Hoefling
da2e1704ea
Fix for issue #25016
2015-07-06 09:32:50 -06:00
rallytime
c0c2463b64
Partial backport of #25019
...
Only backport the new .rst files for states that exist in the 2015.5 branch
Refs #25019
2015-07-06 09:28:43 -06:00
Pedro Algarvio
b8f0eca984
Comment out imports while the YAML and RST rendering is not in-place.
2015-07-06 16:26:56 +01:00
Mike Place
09602808a0
Merge pull request #25161 from aneeshusa/allow-checking-non-normalized-systemd-service-availability
...
Allow checking for non-normalized systemd units.
2015-07-06 09:15:31 -06:00
Jason Keene
a891108793
Add docs for key arg in ssh_known_hosts.present
2015-07-06 09:14:28 -06:00
joseph.gimenez@peoplematter.com
3e6eab3ae9
ec2 network_interfaces fix
2015-07-06 09:13:03 -06:00
Mike Place
3599b8abab
Merge pull request #25151 from jleroy/ipv6-scope-support
...
Support for IPv6 addresses scopes in network.interfaces
2015-07-06 08:43:03 -06:00
Mike Place
66d6365a9f
Merge pull request #25166 from cachedout/lint_saltnado
...
Lint #25149
2015-07-06 08:40:29 -06:00
Mike Place
2fe167edf8
Lint #25149
2015-07-06 08:39:48 -06:00
Mike Place
2f1bad1c01
Merge pull request #25149 from jacksontj/saltnado
...
Saltnado multiprocess support
2015-07-06 08:38:43 -06:00
Aneesh Agrawal
b4d544fe70
Allow checking for non-normalized systemd units.
...
When using service.available with the systemd provider, allow appending
the .service suffix for service files, so that service.available('sshd')
and service.available('sshd.service') both are True.
2015-07-06 07:44:46 -04:00
Pedro Algarvio
e5f77bcff1
Merge pull request #25158 from s0undt3ch/features/raas-17-salt-cloud-2015.8
...
Comment out not implemented code
2015-07-06 11:45:11 +01:00
Pedro Algarvio
583a229d98
Comment out not implemented code
2015-07-06 11:44:28 +01:00
Jonathan Leroy
edce034e6c
Support for IPv6 addresses scopes in network.interfaces
2015-07-04 19:22:52 +02:00
Thomas Jackson
6aa5548e2d
Enable multiprocess support in saltnado
...
The main exception seen is the incompatibility of debug=True and multiprocessing. In addition to that we were initing the event listener (read: zmq sockets) before the fork wich causes other issues. This patch makes rest_tornado fully multiprocess capable.
Feature for #24979
2015-07-03 16:13:10 -07:00
Thomas Jackson
9a1351eada
Change print to logger, so we can set a level and log exc_info
2015-07-03 15:53:31 -07:00
Pedro Algarvio
0cbf22d884
Merge pull request #25145 from s0undt3ch/features/raas-17-salt-cloud-2015.8
...
Implement `oneOf`, `anyOf`, `allOf` and `not` with unit tests
2015-07-03 17:56:44 +01:00
Pedro Algarvio
44738b2123
Lint fixes
2015-07-03 17:56:31 +01:00
Pedro Algarvio
f84c3e4fbd
Add support for enumNames
2015-07-03 16:40:48 +01:00
Pedro Algarvio
0d9173c57e
Remove repeated test
2015-07-03 16:28:57 +01:00
Pedro Algarvio
625e0b6c06
Implement oneOf
, anyOf
, allOf
and not
with unit tests
2015-07-03 16:24:46 +01:00
Pedro Algarvio
911862ea44
Merge pull request #25140 from s0undt3ch/features/raas-17-salt-cloud-2015.8
...
Make the detection code work under Python 3.4
2015-07-03 00:26:06 +01:00
Pedro Algarvio
c59d43330c
Make the detection code work under Python 3.4
2015-07-02 21:08:26 +01:00
Thomas S Hatch
3922992e6b
Merge pull request #25131 from s0undt3ch/features/raas-17-salt-cloud-2015.8
...
Array support in salt.utils.config
2015-07-02 13:40:34 -06:00
Thomas S Hatch
a723af0f10
Merge pull request #25120 from d--j/patch-2
...
add missing continue for exeption case
2015-07-02 13:38:45 -06:00
Thomas S Hatch
6e2222241a
Merge pull request #25117 from basepi/fix.fileclient.is_cached
...
Fix fileclient.is_cached
2015-07-02 13:38:26 -06:00
Thomas S Hatch
c80990ba4f
Merge pull request #25087 from 0xf10e/fix_glance_2015.5
...
Fix execution module for glance - now based on 2015.5!
2015-07-02 13:36:27 -06:00
Justin Findlay
dfe3df0dca
Merge pull request #25130 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-07-02 13:26:16 -06:00
Colton Myers
38e243fdfb
Add fix from merge forward
2015-07-02 11:39:49 -06:00
Colton Myers
549ee47420
Merge pull request #25129 from basepi/merge-forward-2015.5
...
[2015.5] Merge forward from 2014.7 to 2015.5
2015-07-02 11:37:40 -06:00