tree 3cc43bb52a526af477b7a979e0b727f0e85e9e92
parent 8fbe2bc7d44da00b3561ca5d8b8afa27d120b77d
parent 56746cc8fc2be414440aba6b1cd11ed6ce5e7ec4
author Ondrej Smola <osmola@mirantis.com> 1526907264 +0000
committer Gerrit Code Review <gerrit2@15508502dd39> 1526907264 +0000

Merge "add salt-override"