Merge "Fixes missing metadata param to controller.yaml"
authorTim Rozet <trozet@redhat.com>
Fri, 19 Aug 2016 22:36:05 +0000 (22:36 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 19 Aug 2016 22:36:05 +0000 (22:36 +0000)

Trivial merge