Merge "Bug 6278: Switch to use odlparent's karaf-parent"
authorY. Richard Yang <yry@cs.yale.edu>
Wed, 28 Sep 2016 23:03:22 +0000 (23:03 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Wed, 28 Sep 2016 23:03:22 +0000 (23:03 +0000)

Trivial merge