Merge "Remove unsued nic dependencies"

author Anil Vishnoi <vishnoianil@gmail.com>

Mon, 23 May 2016 21:14:37 +0000 (21:14 +0000)

committer Gerrit Code Review <gerrit@opendaylight.org>

Mon, 23 May 2016 21:14:37 +0000 (21:14 +0000)
author Anil Vishnoi <vishnoianil@gmail.com>
Mon, 23 May 2016 21:14:37 +0000 (21:14 +0000)
committer Gerrit Code Review <gerrit@opendaylight.org>
Mon, 23 May 2016 21:14:37 +0000 (21:14 +0000)
diff --cc vpnservice/features/pom.xml
Simple merge
diff --cc vpnservice/features/src/main/features/features.xml
Simple merge
author	Anil Vishnoi <vishnoianil@gmail.com>
	Mon, 23 May 2016 21:14:37 +0000 (21:14 +0000)
committer	Gerrit Code Review <gerrit@opendaylight.org>
	Mon, 23 May 2016 21:14:37 +0000 (21:14 +0000)
		1	2
vpnservice/features/pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history
vpnservice/features/src/main/features/features.xml	patch \|	diff1 \|	diff2 \|	blob \| history