tree 0316b259de6ee0db40d5ac403e68e3e1a5489089
parent e72f7791d4eb999d41db178588e0deedc14a6484
parent c146be04ea1b5c1df073263f1de7f600a8988813
author Tomas Kukral <tkukral@mirantis.com> 1488555197 +0000
committer Gerrit Code Review <gerrit2@0048eb735cd7> 1488555198 +0000

Merge "Fix calico configuration"