rallytime
4c245a3fa5
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- salt/modules/x509.py
2016-11-10 16:51:52 -07:00
Erik Johnson
2fc0b222bc
Fix regression in service.dead state ( #37562 )
...
* Fix regression in service.dead state when service is not available
This was originally broken in c4f899b
2016-11-08 14:58:33 -07:00
rallytime
7a03c4df8c
Fix merge conflict resolution error
...
The original conflict resolution adjusted the wrong line. This puts
the test changes on the correct line and restores the original line.
2016-09-29 11:26:50 -06:00
rallytime
6bc3221f7b
Update test to not use the nested context (for Py3 compat)
2016-09-29 11:25:46 -06:00
rallytime
112903ad7e
Merge branch '2016.3' into 'carbon'
...
Conflicts:
- conf/master
- doc/ref/configuration/master.rst
- salt/cli/daemons.py
- salt/client/ssh/__init__.py
- salt/config/__init__.py
- salt/modules/archive.py
- salt/modules/cmdmod.py
- tests/unit/states/service_test.py
2016-09-29 09:56:43 -06:00
Denys Havrysh
c4f899b3b3
salt.states.service: detect that service failed to start/stop
2016-09-27 18:24:37 +03:00
rallytime
1bf840b036
Merge branch '2016.3' into 'develop'
...
No conflicts.
2016-09-02 09:43:40 -06:00
Mike Place
6cf56843d4
Revert "service state integration tests"
2016-09-02 21:38:15 +09:00
rallytime
86a5e04417
Pylint fix
2016-08-08 09:53:29 -06:00
rallytime
f42ca4b576
PY3: Don't use contextlib.nested - it is deprecated.
...
contextlib.nested is deprecated in Python 3. Instead of having two
different ways of handling nested (PY2) vs ExitStacks (PY3), just use
nested with statements for both.
2016-08-03 14:49:24 -06:00
Justin Findlay
90aee79c39
states.service.mod_watch: update unit test
2016-06-06 10:54:16 -06:00
Z. Liu
a1250a9729
check service enable state in test mode
2015-12-01 15:02:00 +08:00
Mike Place
85f5e2a443
Fix failing tests
2015-08-04 09:48:43 -06:00
Mathieu Le Marec - Pasquet
e26885d8cb
lint
2015-05-16 14:21:17 +02:00
Mathieu Le Marec - Pasquet
bde7867c98
service/{dead/running} optimizations & test fixes
...
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-16 13:33:34 +02:00
Rahul Handay
7f73bdd523
Adding states/service.py unit test cases
2015-04-14 12:35:50 +05:30
