commit c7d0075d223eab9f89fd28853c4b138792059be9
author Patrick Brady <pb071s@att.com> Thu Jun 01 10:45:37 2017 -0700
committer Patrick Brady <pb071s@att.com> Fri Jun 02 13:05:15 2017 -0700
tree 40aa3e41e598ea7a59bcf6899a2004c1abab11c2
parent 8aac2df744820304ee29354333661699e9695939

Merge of new rebased code

Change-Id: I9b8d1f69eb3e0af1935ed8304fea4bf54c1aac47
Signed-off-by: Patrick Brady <pb071s@att.com>

appc-dg/appc-dg-shared/appc-dg-shared-features/src/main/resources/features.xml

diff --git a/appc-dg/appc-dg-shared/appc-dg-shared-features/src/main/resources/features.xml b/appc-dg/appc-dg-shared/appc-dg-shared-features/src/main/resources/features.xml
index 3271f7a..c8925fe 100644
--- a/appc-dg/appc-dg-shared/appc-dg-shared-features/src/main/resources/features.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-shared-features/src/main/resources/features.xml
@@ -29,7 +29,9 @@
 	<feature name='appc-dg-shared' description="appc-dg-shared" version='${project.version}'>
 		<feature version='${project.version}'>appc-ssh-adapter</feature>
 		<feature version='${project.version}'>appc-netconf-adapter</feature>
-		<bundle>mvn:org.openecomp.appc/appc-dg-common/${project.version}</bundle>
+		<feature version='${sdnctl.sli.version}'>sdnc-sli</feature>
+        <bundle dependency="true">mvn:org.openecomp.appc/appc-common/${project.version}</bundle>
+        <bundle start-level="85" start="true">mvn:org.openecomp.appc/appc-dg-common/${project.version}</bundle>
 		<bundle>mvn:org.openecomp.appc/appc-dg-ssh/${project.version}</bundle>
 		<bundle start-level="85" start="true">mvn:org.openecomp.appc/appc-dg-netconf/${project.version}</bundle>
 		<bundle>mvn:org.openecomp.appc/appc-dg-license-manager/${project.version}</bundle>