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
|
f1ba391624
|
Trailing slash
|
2015-04-14 17:23:06 -06:00 |
|
Colton Myers
|
e0c212866b
|
Missing trailing underscore for test
|
2015-04-14 12:59:27 -06:00 |
|
Pedro Algarvio
|
1181a50d0d
|
Don't assume we're running the tests as root
|
2015-04-10 00:52:32 +01:00 |
|
rallytime
|
12aa7e1ff6
|
Python 3 compat fix for states/archive_test.py
|
2015-03-23 15:45:40 -06:00 |
|
Colton Myers
|
70406867a4
|
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
salt/client/__init__.py
salt/modules/file.py
salt/modules/yumpkg.py
salt/modules/zypper.py
tests/integration/shell/auth.py
tests/unit/states/archive_test.py
tests/unit/states/module_test.py
|
2015-03-20 20:09:19 -06:00 |
|
Colton Myers
|
18ab3f8275
|
Is it the underscore of doom?
|
2015-03-20 13:06:16 -06:00 |
|
Colton Myers
|
d89d8f5d2d
|
Add the trailing slash
|
2015-03-20 11:55:45 -06:00 |
|
Colton Myers
|
4eee083691
|
Reorder mocked arguments
|
2015-03-20 10:36:25 -06:00 |
|
Justin Findlay
|
5f143ecb60
|
unit tests for states.archive.extracted tar opts
Implements tests for #20795.
|
2015-03-17 20:40:20 -06:00 |
|
Alexander Schwartz
|
7c6b8f1221
|
clean up lint messages
|
2015-02-11 19:57:14 +00:00 |
|
Alexander Schwartz
|
c05aae9ce7
|
added archive test script
|
2015-02-09 14:52:46 +00:00 |
|