saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '2016.3' into '2016.11'

Browse source 
No conflicts.
This commit is contained in:
rallytime 2017-02-22 16:51:31 -07:00
commit 397c756a01
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.mention-bot Normal file
View file

@ -0,0 +1,6 @@
{
"skipTitle": "Merge forward",
"delayed": true,
"delayedUntil": "2h"
}

1
salt/states/dockerng.py
View file

@ -51,7 +51,6 @@ from salt.modules.dockerng import (
VALID_CREATE_OPTS,
_validate_input,
_get_repo_tag,
_get_docker_py_versioninfo,
)
# pylint: enable=no-name-in-module,import-error
import salt.utils