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
Thomas Jackson
bc32f66b98
Add runner_async endpoint to salnado
...
Feature for #25427
2015-07-15 09:07:26 -07: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
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
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
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
Colton Myers
befb666623
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/modules/mongodb.py
salt/utils/http.py
salt/utils/process.py
tests/integration/__init__.py
2015-04-27 10:28:53 -06:00
rallytime
8d5b50e17c
Don't forget the blank lines at the end of the file
2015-04-24 16:29:51 -06:00
rallytime
9830708f86
Some small test clean up changes
2015-04-24 16:27:22 -06:00
Colton Myers
11356cb0c6
Use print_function
2015-04-16 12:16:44 -06:00
Colton Myers
000de95974
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
.pylintrc
doc/ref/runners/all/salt.runners.nacl.rst
doc/topics/cloud/config.rst
salt/cli/salt.py
salt/client/mixins.py
salt/client/ssh/__init__.py
salt/loader.py
salt/minion.py
salt/modules/cassandra_cql.py
salt/modules/gpg.py
salt/modules/grains.py
salt/modules/iptables.py
salt/modules/yumpkg.py
salt/netapi/rest_cherrypy/app.py
salt/renderers/pyobjects.py
salt/returners/mysql.py
salt/runners/jobs.py
salt/state.py
salt/states/file.py
salt/states/service.py
salt/utils/minions.py
tests/integration/__init__.py
tests/integration/netapi/rest_tornado/test_app.py
tests/integration/states/cmd.py
2015-04-16 12:15:44 -06:00
Colton Myers
9099884809
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/cloud/config.rst
salt/modules/win_disk.py
salt/modules/yumpkg.py
salt/pillar/s3.py
salt/states/service.py
salt/utils/event.py
tests/integration/netapi/rest_tornado/test_app.py
tests/integration/netapi/test_client.py
tests/unit/states/archive_test.py
2015-04-14 11:03:03 -06:00
Joshua Semar
d9ed9f1e5b
fix linting errors
2015-04-10 16:35:07 +00:00
Joshua Semar
c56845e904
include mod_opts on tornado application, refactor get_app
2015-04-10 15:06:30 +00:00
Thomas Jackson
7614f7ed10
Caste returns to sets, since we don't care about order.
2015-04-09 07:45:24 -07:00
Justin Findlay
fceb83bf16
sort integration test minion return lists
2015-04-06 22:07:56 -06:00
Justin Findlay
a927087f64
debug rest_tornado test error
2015-04-02 09:05:48 -06:00
Colton Myers
d82d7645c9
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/modules/cmdmod.py
salt/modules/debian_ip.py
salt/modules/drac.py
salt/modules/rpm.py
salt/returners/postgres_local_cache.py
2015-03-19 16:13:16 -06:00
Thomas Jackson
234d02b218
Add timeout to saltnado's event listener
...
Fixes #21707
The issue is basically that the master has seen N minions-- and not all N are currently connected. The publish job returns to the salt-api that N minions got the job-- and it dutifilly waits for all the returns. With this we use the same ping timeout that the CLI does while waiting for returns. So once all minions are no longer running the job we will return.
2015-03-18 08:09:41 -07:00
Thomas Jackson
205787c256
Add timeout to saltnado's event listener
...
Fixes #21707
The issue is basically that the master has seen N minions-- and not all N are currently connected. The publish job returns to the salt-api that N minions got the job-- and it dutifilly waits for all the returns. With this we use the same ping timeout that the CLI does while waiting for returns. So once all minions are no longer running the job we will return.
2015-03-17 19:17:32 -07:00
rallytime
759ce02829
Pylint fix for 2015.2
2015-02-03 10:02:05 -07:00
Mike Place
68418d79a7
Typo
2015-02-02 13:52:26 -07:00
Mike Place
5291cf7809
Better detection for minimum pyzmq version
2015-02-02 13:52:26 -07:00
Thomas S Hatch
cefb78efe9
Merge pull request #17883 from s0undt3ch/features/pylint-py3-modernize
...
[Don't merge yet] Py3 compat changes & Update pylintrc to load the py3modernize plugin
2015-01-31 03:13:53 -07:00
rallytime
310e9075bf
Pylint disable StrictVersion import error
2015-01-30 17:32:17 -07:00
Mike Place
710bb63103
Typo
2015-01-30 16:02:56 -07:00
Mike Place
69c5e1f904
Better detection for minimum pyzmq version
2015-01-30 16:01:59 -07:00
Pedro Algarvio
0bc44131e8
Py3 compatibility fixes
2015-01-30 22:25:04 +00:00
Pedro Algarvio
60f215f191
Add from __future__ import absolute_import
2015-01-30 22:25:04 +00:00
rallytime
d724ed3a47
Merge branch '2015.2' into 'develop'
...
Conflicts:
salt/cli/batch.py
salt/cloud/clouds/msazure.py
tests/integration/netapi/rest_tornado/test_app.py
2015-01-16 11:36:32 -07:00
Erik Johnson
175ba127be
Merge branch '2014.7' into 2014.7-2015.2
...
Conflicts:
salt/modules/archive.py
2015-01-14 14:26:22 -06:00
Mike Place
c172470c30
Try giving some rest tornado requests a little more time
2015-01-13 14:17:55 -07:00
Mike Place
74501f56ae
Fix tornado tests
...
The tornado test runner isn't respecting timeouts as it claims it
should in async mode. However, the env variable is working as-described.
2015-01-12 15:36:34 -07:00
Mike Place
d6ce858c23
Try giving some rest tornado requests a little more time
2015-01-08 10:04:19 -07:00
Thomas S Hatch
d416b8b1b8
gix tornado merge conflict
2014-11-26 09:25:47 -07:00
Thomas S Hatch
6aa5b0f858
Merge branch '2014.7' into develop
...
Conflicts:
salt/modules/genesis.py
salt/modules/parted.py
salt/modules/win_service.py
salt/runner.py
salt/states/file.py
tests/integration/netapi/rest_tornado/test_app.py
2014-11-26 09:24:24 -07:00
rallytime
eeab98c3be
Skip tornado tests if we can't import ZMQIOLoop
...
Tornado tests were failing on Ubuntu 10 and 12 because they don't have
a new enough version of PyZMQ to use the ioloop.current function.
2014-11-25 13:06:33 -07:00
Colton Myers
dc43840cee
Merge branch '2014.7' into merge-forward
...
Conflicts:
salt/modules/glusterfs.py
salt/modules/macports.py
salt/modules/makeconf.py
salt/modules/mdadm.py
salt/modules/smartos_vmadm.py
salt/modules/zypper.py
salt/utils/event.py
tests/integration/netapi/rest_tornado/test_app.py
tests/unit/netapi/rest_tornado/test_handlers.py
2014-11-21 12:05:32 -07:00
Thomas Jackson
0a1b88e6b5
Change all saltnado asserts to unittest asserts. This way when there is a failure you get nice pretty printouts!
2014-11-20 18:35:41 -08:00
Pedro Algarvio
0c50d789b7
The imports actually work so shut up PyLint!
2014-11-20 18:22:19 +00:00
Pedro Algarvio
10a9c479ff
Remove unused import
2014-11-20 16:45:36 +00:00
Pedro Algarvio
5cf320f45f
Allow the tests to be skipped
2014-11-20 16:40:47 +00:00
Thomas Jackson
837a8ed475
Move EventListener over to ZMQStreams
2014-11-17 08:24:28 -08:00
Thomas Jackson
f7adfb44e9
Increase timeout from 5s to 10s, since jenkins seems to have issues calling runners in 5s
2014-11-14 18:08:44 -08:00
Thomas Jackson
ea8b4bb479
Make sure to only cleanup the tag_map in the case that you timeout the future
2014-11-14 11:47:35 -08:00
Thomas Jackson
e2102fcbc7
Pylint cleanup
2014-11-14 09:15:54 -08:00
Thomas Jackson
6f0552c9e1
Pylint fixes
2014-11-13 09:33:14 -08:00
Thomas Jackson
9e61037b0d
Cleanup, and fix exp_form override-- we need to do it after the ping to minions
2014-11-13 08:36:28 -08:00
Thomas Jackson
ce22427071
Remove timeout test since that no longer valid
2014-11-13 08:36:28 -08:00
Thomas Jackson
31b54762b0
Add tests for multi-post and multi-token
2014-11-13 08:36:28 -08:00
