tree 550fa57593d4d91dac09b91cfdf879e07594248b
parent 54b61df91415d5d0c02c8d43c8555055164c54ba
parent aab8a40cfe4f3522bd46c5706ec2c754f6585597
author Jakub Josef <jjosef@mirantis.com> 1521737731 +0000
committer Gerrit Code Review <gerrit2@56fc70e46927> 1521737731 +0000

Merge "add routing and DNS configuration in salt-master"