tree 94c6c5449d4ea5e64d51d04fa57fd5ff31fa59b1
parent d3a852eb2901a5a15308092b8bedb572bcddb072
parent 3cbb7fe7c684abd5dacc99c186cd496d28425192
author Matthew Mosesohn <mmosesohn@mirantis.com> 1501846942 +0000
committer Gerrit Code Review <gerrit2@980ef0291b9e> 1501846943 +0000

Merge "Use kube-addon-manager service"