tree e56ea34de66d3ce4398f7c3abdc4a87c638e691e
parent 1cb790dd3f23977f2b8d407182c147bb7f38a17a
parent 8c60f6884cc9fe0dbb3d2ad2c92be93fe68a4d98
author Jakub Josef <jjosef@mirantis.com> 1510844756 +0000
committer Gerrit Code Review <gerrit2@44cc31867e31> 1510844756 +0000

Merge "Add support for new schema of deploy salt master."