Merge "BUG 2335 : Add jolokia feature"
authorEd Warnicke <eaw@cisco.com>
Tue, 2 Dec 2014 14:49:28 +0000 (14:49 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 2 Dec 2014 14:49:29 +0000 (14:49 +0000)

Trivial merge