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
|
a02ced40f0
|
Lint
|
2015-04-14 12:57:25 -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 |
|
Thomas Jackson
|
77395d76d8
|
Change to sets, we don't gaurantee minion ordering in returns
|
2015-04-09 09:06:59 -07:00 |
|
Justin Findlay
|
fceb83bf16
|
sort integration test minion return lists
|
2015-04-06 22:07:56 -06:00 |
|
Pedro Algarvio
|
60f215f191
|
Add from __future__ import absolute_import
|
2015-01-30 22:25:04 +00:00 |
|
Colton Myers
|
c4da7bdd64
|
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
salt/client/mixins.py
salt/daemons/flo/__init__.py
|
2015-01-26 19:44:59 -07:00 |
|
Pedro Algarvio
|
a6c3915049
|
Fix order for proper diff on failure
|
2015-01-24 03:16:51 +00:00 |
|
Thomas Jackson
|
925afac98d
|
Temporarily change this test to work around race condition in the runnerclient
@rallytime If you have some list of tests that are disabled that shouldn't be, this is one for the list :)
|
2015-01-10 00:18:16 -08:00 |
|
Justin Findlay
|
b097a1e16b
|
pre-emptive pylint fix0r
|
2014-11-11 15:22:40 -07:00 |
|
Justin Findlay
|
abb3ba87bf
|
integration test: known JID through netapi #15763
|
2014-11-11 15:15:36 -07:00 |
|
rallytime
|
96a1288808
|
Add minions_denied to netapi test
|
2014-10-14 16:49:07 -06:00 |
|
Pedro Algarvio
|
5e4eb4bbaf
|
Don't add tests in __init__
|
2014-10-08 01:02:10 +01:00 |
|