valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2016.11' into 'develop'

Browse Source 
Conflicts:
  - salt/template.py
  - tests/unit/modules/dockerng_test.py
This commit is contained in:
rallytime 2017-03-30 12:32:24 -06:00
commit 1792acedc0
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/faq.rst
View File

@ -268,7 +268,7 @@ Upgrade without automatic restart
*********************************
Doing the Minion upgrade seems to be a simplest state in your SLS file at
first. But the operating systems such as Debian GNU/Linux, Ununtu and their
first. But the operating systems such as Debian GNU/Linux, Ubuntu and their
derivatives start the service after the package installation by default.
To prevent this, we need to create policy layer which will prevent the Minion
service to restart right after the upgrade:

5
tests/unit/modules/test_dockermod.py
View File

@ -41,7 +41,10 @@ class DockerTestCase(TestCase, LoaderModuleMockMixin):
def setup_loader_modules(self):
return {docker_mod: {'__context__': {'docker.docker_version': ''}}}
docker_version = docker_mod.docker.version_info
try:
docker_version = docker_mod.docker.version_info
except AttributeError:
docker_version = 0,
def test_ps_with_host_true(self):
'''