Merge "Bug 6278: Switch to use odlparent's karaf-parent"
authorRyan Vail <r.vail@cablelabs.com>
Tue, 16 Aug 2016 13:53:59 +0000 (13:53 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 16 Aug 2016 13:53:59 +0000 (13:53 +0000)

Trivial merge