Merge "Depend on opendaylight-karaf-empty from odlparent"
authorDan Timoney <dtimoney@att.com>
Tue, 16 May 2017 18:55:55 +0000 (18:55 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 16 May 2017 18:55:55 +0000 (18:55 +0000)
1  2 
dblib/features/pom.xml
rootpom/pom.xml

Simple merge
diff --cc rootpom/pom.xml
Simple merge