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
|
2b1f400ab4
|
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
doc/topics/topology/syndic.rst
salt/client/__init__.py
salt/daemons/masterapi.py
salt/minion.py
salt/modules/dockerio.py
|
2015-03-19 16:03:29 -06:00 |
|
Justin Findlay
|
53c9d48331
|
fix typo
|
2015-03-17 19:58:05 -06:00 |
|
Pedro Algarvio
|
60f215f191
|
Add from __future__ import absolute_import
|
2015-01-30 22:25:04 +00:00 |
|
Mike Place
|
b811f633af
|
Fix one more failing test
|
2014-12-10 09:33:54 -07:00 |
|
rallytime
|
19d70dfac5
|
Added another test to module.run state unit tests
|
2014-10-24 15:28:03 -06:00 |
|
rallytime
|
f6490e9572
|
Add initial unit tests for module.run state function
|
2014-10-24 08:56:40 -06:00 |
|