tree 9897c374d902f85d2c4a96b5ad4e2a349ced9c85
parent ffb25f148036e33ad0bcd82c32879f7abee86bca
parent 1ed6e9e757ad3ec76b3721b08c17e2d7f60d1e0f
author Ondrej Smola <osmola@mirantis.com> 1520414584 +0000
committer Gerrit Code Review <gerrit2@56fc70e46927> 1520414584 +0000

Merge "Moved saltstack trusty repo to upstream from mcp."