tree e737eea0c5146cb5bb4405f56de3e73e67035466
parent 943eef8098c0bb99a5ebed149710bd8f190ed090
parent d46a561f8c48f554977314ba53edd0f685ab5ae2
author Jenkins <jenkins@review.openstack.org> 1476953014 +0000
committer Gerrit Code Review <review@openstack.org> 1476953014 +0000

Merge "Salt master support"