tree 036747b7045967ebc476869054b43e4b6fb77563
parent a9b68fe64538071a4567f21eb0bab19eed40f994
parent 80b0e7797a09cabaa8def6854cf4f00b5cc072d8
author Filip Pytloun <fpytloun@mirantis.com> 1505995859 +0000
committer Gerrit Code Review <gerrit2@37fca7c923f6> 1505995859 +0000

Merge "Fix kubernetes autodiscovery"