tree d88ade6a1f193742d341d4c44de2f64f598e4c07
parent 7335bd143866c22b4230c9bfecdbbb58464824f1
parent 3a8c0e8809fddee817d5ba3275b15eb81b7b7146
author Ondrej Smola <osmola@mirantis.com> 1526907280 +0000
committer Gerrit Code Review <gerrit2@15508502dd39> 1526907280 +0000

Merge "add salt-override"