Dmitry Kuzmenko
bf9dd00aac
Subscribe event to bus is optional now
...
Once subscribed to publisher SUB socket gets collecting all incoming
messages that is unwanted behavior for fire-only events.
Fixed by using listen=<True|False> constructor argument.
2015-07-29 17:44:02 +03:00
Pedro Algarvio
e7681f7c75
Try to overcome a failure to get cwd in Cent tests
2015-07-28 12:07:04 +01:00
Mike Place
bc2321a5c6
Merge pull request #25595 from terminalmage/git_pillar-rewrite
...
Bring git_pillar up to feature parity with gitfs
2015-07-22 10:55:13 -06:00
Erik Johnson
a1ffa0c1c4
More test fixes
2015-07-22 10:40:49 -05:00
Erik Johnson
73192390a2
Test fixes
2015-07-22 00:48:43 -05:00
Justin Findlay
5c94fe3ad3
Merge pull request #25599 from jfindlay/tcp_test
...
fix transport settings in #25596
2015-07-21 17:43:45 -06:00
Justin Findlay
146e6e519a
fix transport settings in 3083c71
2015-07-21 16:42:33 -06:00
Mike Place
89e0f151fa
Merge pull request #25596 from jfindlay/tcp_test
...
Tcp test
2015-07-21 16:34:56 -06:00
Justin Findlay
a95353b4e3
add tcp transport to shell.key tests
2015-07-20 17:02:25 -06:00
Justin Findlay
3083c71ec3
add tcp transport opt to test runner
2015-07-20 16:52:48 -06:00
Colton Myers
76e468bc20
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/topics/cloud/vmware.rst
salt/cloud/clouds/digital_ocean_v2.py
salt/cloud/clouds/vmware.py
salt/daemons/flo/core.py
salt/modules/hipchat.py
salt/modules/lxc.py
salt/modules/rabbitmq.py
salt/pillar/s3.py
salt/states/dockerio.py
salt/states/file.py
salt/utils/process.py
salt/utils/s3.py
2015-07-20 13:55:14 -06:00
Seth House
cb98d79cdd
Merge pull request #25457 from jacksontj/saltnado
...
Saltnado
2015-07-15 11:50:12 -06:00
Thomas Jackson
bc32f66b98
Add runner_async endpoint to salnado
...
Feature for #25427
2015-07-15 09:07:26 -07:00
Pedro Algarvio
c4b15840c6
Additional test case for question raised in #1846
...
https://github.com/saltstack/salt/issues/1864#issuecomment-102246258
2015-07-15 14:29:43 +01:00
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
