rallytime
|
0b1e9e9a78
|
Merge branch '2016.3' into 'develop'
Conflicts:
- salt/client/mixins.py
- salt/grains/core.py
- salt/modules/saltutil.py
- salt/runner.py
- salt/states/saltmod.py
- salt/wheel/__init__.py
- tests/unit/states/saltmod_test.py
|
2016-08-10 10:25:32 -06:00 |
|
Erik Johnson
|
d621aa7b61
|
Update runner/wheel unit tests to reflect new key in ret dict
|
2016-08-09 08:49:52 -05:00 |
|
Erik Johnson
|
c3f9e13fbe
|
Update unit tests to reflect new behavior of WheelClient/RunnerClient
|
2016-07-27 13:01:24 -05:00 |
|
Loren Gordon
|
f7fd2962cb
|
Update saltmod tests to use master __opts__
|
2016-06-15 14:12:53 -04:00 |
|
Mike Place
|
6f65fbdb82
|
Fix test
|
2015-07-22 11:43:19 -06:00 |
|
Justin Findlay
|
c82339ba74
|
fix saltmod.function unit test
|
2015-04-16 21:09:59 -06:00 |
|
Colton Myers
|
728e74c921
|
Better return data for mocked saltutil.cmd for saltmod.function
|
2015-04-16 17:46:32 -06:00 |
|
Jayesh Kariya
|
0f6fbf66d7
|
adding states/saltmod unit test case.
|
2015-04-14 14:30:58 +05:30 |
|