tree ce831698062c580289e7236d9420ba7ed6a0dd5c
parent 24be3109beacc9cd6613bca2bfec97cff8870f2b
parent fdc3fc1367ba6584c8290c3090f0d57b941e91cc
author Aleksey Zvyagintsev <azvyagintsev@mirantis.com> 1534927229 +0000
committer Gerrit Code Review <gerrit2@84b5d06f6116> 1534927229 +0000

Merge "Sync salt minion|master.conf default params"