Merge "Controller 3node: jolokia instead of netconf-connector"
authorJamo Luhrsen <jluhrsen@redhat.com>
Wed, 3 Feb 2016 17:46:48 +0000 (17:46 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Wed, 3 Feb 2016 17:46:48 +0000 (17:46 +0000)

Trivial merge