From: Vishal Thapar <vishal.thapar@ericsson.com>
Date: Mon, 7 Dec 2015 06:27:21 +0000 (+0000)
Subject: Merge "Adding IdManager/LockManager and related Changes"
X-Git-Tag: release/beryllium~94
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=vpnservice.git;a=commitdiff_plain;h=478586aec1c6363f22cc99a99cdd37fa14bd4dbe

Merge "Adding IdManager/LockManager and related Changes"
---

478586aec1c6363f22cc99a99cdd37fa14bd4dbe
diff --cc features/pom.xml
index 4b109efe,8433fba5..72b6f763
--- a/features/pom.xml
+++ b/features/pom.xml
@@@ -33,8 -33,8 +33,9 @@@ and is available at http://www.eclipse.
      <interfacemgr.version>${vpnservices.version}</interfacemgr.version>
      <nexthopmgr.version>${vpnservices.version}</nexthopmgr.version>
      <fibmanager.version>${vpnservices.version}</fibmanager.version>
+     <lockmanager.version>${vpnservices.version}</lockmanager.version>
      <idmanager.version>${vpnservices.version}</idmanager.version>
 +	<itm.version>${vpnservices.version}</itm.version>
    </properties>
    <dependencyManagement>
      <dependencies>
diff --cc pom.xml
index 561d19de,f090c569..d1924206
--- a/pom.xml
+++ b/pom.xml
@@@ -23,10 -25,8 +25,9 @@@ and is available at http://www.eclipse.
      <module>vpnmanager</module>
      <module>interfacemgr</module>
      <module>nexthopmgr</module>
-     <module>idmanager</module>
      <module>fibmanager</module>
      <module>bgpmanager</module>
 +    <module>itm</module>
      <module>distribution/karaf</module>
      <module>features</module>
      <module>vpnservice-artifacts</module>