Colton Myers
24d51fb8f1
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/ref/configuration/minion.rst
salt/config.py
salt/modules/sudo.py
tests/integration/states/file.py
2015-07-02 09:46:36 -06:00
Justin Findlay
576f1b8493
Merge pull request #25008 from basepi/merge-forward-develop
...
Merge forward from 2015.5 to develop
2015-07-01 19:04:59 -06:00
Justin Findlay
6f238e924c
integration test file.managed sources
2015-06-30 14:26:59 -06:00
Colton Myers
99fc7ecb4b
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/man/salt-call.1
doc/man/salt-cloud.1
doc/man/salt-cp.1
doc/man/salt.7
salt/cloud/__init__.py
salt/fileclient.py
salt/modules/file.py
salt/modules/gpg.py
2015-06-29 16:49:40 -06:00
twangboy
96bc5aed10
Fixed more testing stuff, an egregious error
2015-06-29 12:27:22 -06:00
rallytime
b68e3c0d0c
Update the Azure Cloud Provider tests to be more acurate and use newer azure SDK version
2015-06-25 15:14:21 -06:00
Thomas Jackson
87adca46e0
Fix memory leak in saltnado
...
Fixes #24846
If an event was checked after the request was closed out it was possible for requests to get into the event_listener's mapping and never be cleaned out. This fixes the leak by checking if the request is open or not before adding it to the mappings.
2015-06-25 09:06:33 -07:00
rallytime
e89564c775
Update Rackspace cloud test file to be more accurate
2015-06-22 10:18:52 -06:00
Nicole Thomas
6fa7e5c5f2
Merge pull request #24833 from rallytime/fix_linode_tests
...
Fix linode cloud tests
2015-06-20 14:15:09 -06:00
rallytime
c56d3150ec
Fix linode cloud tests
2015-06-19 10:55:12 -06:00
rallytime
4a0626bf27
Python 3 compat fix
2015-06-18 18:42:04 -06:00
rallytime
5c137c86ad
Make the GoGrid Cloud Provider Tests work
2015-06-18 17:08:57 -06:00
Colton Myers
a5c9681672
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/topics/releases/version_numbers.rst
salt/cli/batch.py
salt/minion.py
salt/state.py
setup.py
2015-06-18 11:43:11 -06:00
C. R. Oldham
0f9298263b
Merge pull request #24768 from jfindlay/pkg_mod
...
fix yum versionlock on RHEL/CentOS 5, disable corresponding test
2015-06-18 09:13:12 -06:00
Thomas Jackson
b1211c5422
Re-enable tests for complex prereq and prereq_in
...
Since #24770 is fixed, #8211 is also fixed (since they are basically the same issue)
2015-06-17 21:57:37 -07:00
Justin Findlay
7a26c2b5b9
disable pkg.hold test for RHEL/CentOS 5
2015-06-17 16:36:36 -06:00
Mike Place
e6dcf3ab12
Merge pull request #24703 from mattmb/fix/onchanges-and-or
...
Multiple onchanges requisite behaviour
2015-06-17 12:26:39 -06:00
Mike Place
d877f4f775
Merge pull request #23383 from cachedout/remove_overstate
...
Overstate is dead. Long live orchestrate!
2015-06-17 11:14:52 -06:00
Mike Place
dab4eccd00
Remove overstate tests
2015-06-17 11:14:19 -06:00
mattmb
a5607d5e07
Multiple onchanges requisite behaviour
...
Change the onchanges requisite so that if you list multiple onchanges
requisites then only one must change to trigger the state. Currently all
the watched states must change to cause the trigger. This fixes #19592
2015-06-16 15:02:11 +01:00
Colton Myers
5b49e89b43
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
2015-06-12 11:42:42 -06:00
Justin Findlay
d88fb22fdc
fix pkg module integration tests on CentOS 5
2015-06-11 14:56:52 -06:00
Justin Findlay
fb91b40ba0
fix pkg module integration tests on ubuntu 12
2015-06-11 12:46:22 -06:00
Michael Steed
83a96367a4
Manual merge of #24414 per thatch45
2015-06-06 07:47:52 -06:00
Colton Myers
baf4337918
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/modules/lxc.py
salt/roster/clustershell.py
2015-06-03 13:47:08 -06:00
Justin Findlay
c2db0b1758
fix pkg hold/unhold integration test
2015-06-02 11:56:18 -06:00
Colton Myers
a6a868be6b
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/modules/iptables.py
salt/utils/dictupdate.py
2015-06-01 10:29:32 -06:00
Justin Findlay
98944d8c7f
fix pkg test on ubuntu 12.04 for realz
2015-05-31 22:23:17 -06:00
Colton Myers
5fcbcfe6d5
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/topics/cloud/digitalocean.rst
doc/topics/tutorials/index.rst
salt/cloud/clouds/digital_ocean.py
salt/modules/lxc.py
salt/returners/__init__.py
2015-05-29 17:33:28 -06:00
Justin Findlay
9508924c02
fix pkg mod integration test on ubuntu 12.04
2015-05-29 15:52:57 -06:00
Colton Myers
c4f5e231fa
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2
...
Conflicts:
doc/_themes/saltstack2/layout.html
doc/conf.py
doc/index.rst
doc/ref/modules/all/salt.modules.hipchat.rst
doc/topics/releases/index.rst
salt/client/ssh/client.py
salt/cloud/clouds/vsphere.py
salt/modules/boto_dynamodb.py
salt/modules/boto_route53.py
salt/modules/data.py
salt/modules/http.py
salt/modules/tls.py
salt/output/compact.py
salt/states/boto_elb.py
salt/states/linux_acl.py
salt/states/rabbitmq_user.py
salt/states/win_servermanager.py
salt/utils/dictupdate.py
salt/wheel/config.py
2015-05-29 15:10:13 -06:00
Aneesh Agrawal
4b9311507c
Add new module type for serializers from issue #22257 .
...
Move existing serializers from salt.utils.serializers to
salt.serializers.
2015-05-28 20:03:11 -04:00
Justin Findlay
6b6280442c
disable intermittently failing tests
...
This commit is to be reverted when #23623 is merged.
2015-05-28 16:23:57 -06:00
Nicole Thomas
fd41993022
Merge pull request #24157 from basepi/merge-forward-develop
...
Merge forward from 2015.5 to develop
2015-05-27 16:09:00 -06:00
Colton Myers
9dab9a1dda
Fix python3 lint
2015-05-27 13:07:47 -06:00
Colton Myers
60f2e9eefb
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/topics/development/contributing.rst
salt/modules/tls.py
2015-05-26 16:38:42 -06:00
Doug Luce
6fe47ea1f4
Allow URL specification of NPM packages
...
If an NPM package was specified as a
url (i.e. git://github.com/Unitech/pm2), the state would crash with an
IndexError. Assume that not every package installed globally is
specified with a URL.
Example failing state:
kvsio:
npm.installed:
- name: git+ssh://github.com/dougluce/kvs.io.git
2015-05-26 13:19:17 -07:00
Thomas S Hatch
9cec5d3dc9
Merge pull request #24088 from jfindlay/pkg_tests
...
pkg module integration tests
2015-05-25 13:39:02 -06:00
Justin Findlay
f1bd5ec404
adding pkg module integration tests
2015-05-23 19:34:37 -06:00
rallytime
7146871d73
Revert "Remove key management test from digital ocean cloud tests"
...
This reverts commit 1d031caa78
2015-05-22 15:33:40 -06:00
Colton Myers
d7362bb5dd
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/states/file.py
salt/utils/event.py
2015-05-22 13:02:54 -06:00
rallytime
1d031caa78
Remove key management test from digital ocean cloud tests
...
The create_key function was added to develop, but isn't present in 2015.5.
2015-05-21 13:37:34 -06:00
Colton Myers
58aed60838
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/runners/lxc.py
2015-05-21 11:27:52 -06:00
rallytime
9e0ec07d85
Skip the gpodder pkgrepo test - they don't have vivid ppa up yet
2015-05-20 14:08:42 -06:00
rallytime
dce9b540a6
Remove extra line
2015-05-18 14:49:27 -06:00
rallytime
7ed776c293
Cloud tests should use an image that is LTS
...
Changes the test image to create for digital ocean cloud tests to be on Ubuntu 14.04, not 14.10
2015-05-18 14:04:24 -06:00
rallytime
4acf58e758
Switch digital ocean tests to v2 driver
...
This has been done on develop, but this handles the cloud test failures for 2015.5.
2015-05-18 13:44:08 -06:00
Colton Myers
4ea3f8f80a
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/pillar/neutron.py
salt/utils/http.py
2015-05-15 13:43:40 -06:00
Justin Findlay
b8867a8c23
update pip tests
2015-05-15 00:15:26 -06:00
rallytime
7e15ff94ff
Move digital_ocean_v2 tests to be the defauly/only tests for digital ocean cloud tests
2015-05-14 15:25:00 -06:00
