Merge branch 'master' into topic/ietf_yang

Change-Id: I7cb3bb7f8f6423db3bf51e0b49e66a4472d2c03a
Signed-off-by: Lorand Jakab <lojakab@cisco.com>

diff --cc features/src/main/features/features.xml
index 40c1169877e4e7e173f7b2c704572b445f1fafaf,225fcd23096b87b0b5b167046e72424ad0fef3ce..b901d73e69cdcb1ca6b1451a950f87fe6f98e2aa
--- 1/features/src/main/features/features.xml
--- 2/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@@ -12,16 -12,15 +12,16 @@@
            xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
  
      <!-- Needed for odl-mdsal-broker -->
-     <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features</repository>
-     <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
+     <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/{{VERSION}}/xml/features</repository>
+     <repository>mvn:org.opendaylight.controller/features-mdsal/{{VERSION}}/xml/features</repository>
      <!-- Needed for odl-restconf -->
-     <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
+     <repository>mvn:org.opendaylight.netconf/features-restconf/{{VERSION}}/xml/features</repository>
      <!-- Needed for odl-config-api -->
-     <repository>mvn:org.opendaylight.controller/features-config/${config.version}/xml/features</repository>
-     <repository>mvn:org.opendaylight.neutron/features-neutron/${neutron.version}/xml/features</repository>
-     <repository>mvn:org.opendaylight.dlux/features-dlux/${dlux.core.version}/xml/features</repository>
+     <repository>mvn:org.opendaylight.controller/features-config/{{VERSION}}/xml/features</repository>
+     <repository>mvn:org.opendaylight.neutron/features-neutron/{{VERSION}}/xml/features</repository>
+     <repository>mvn:org.opendaylight.dlux/features-dlux/{{VERSION}}/xml/features</repository>
  
 +    <!--
      <feature name="odl-lispflowmapping-msmr" description="OpenDaylight :: LISP Flow Mapping :: Map-Server/Map-Resolver" version='${project.version}'>
          <feature version="${project.version}">odl-lispflowmapping-mappingservice</feature>
          <feature version="${project.version}">odl-lispflowmapping-southbound</feature>
@@@ -67,18 -65,19 +66,22 @@@
      <feature name="odl-lispflowmapping-ui" description="OpenDaylight :: LISP Flow Mapping :: User Interface" version='${project.version}'>
          <feature version="${dlux.core.version}">odl-dlux-core</feature>
          <feature version="${project.version}">odl-lispflowmapping-mappingservice</feature>
-         <bundle>mvn:org.opendaylight.lispflowmapping/lispflowmapping-ui-bundle/${project.version}</bundle>
+         <bundle>mvn:org.opendaylight.lispflowmapping/lispflowmapping-ui-bundle/{{VERSION}}</bundle>
      </feature>
 +    -->
  
      <feature name="odl-lispflowmapping-models" description="OpenDaylight :: LISP Flow Mapping :: Models" version='${project.version}'>
          <feature version='${config.version}'>odl-config-api</feature>
          <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
-         <bundle>mvn:org.apache.commons/commons-lang3/${commons.lang3.version}</bundle>
-         <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.lisp-proto/${project.version}</bundle>
-         <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.api/${project.version}</bundle>
 +        <!-- Temporary: add APIDOCS so we don't have to load manually while testing IETF LISP address models -->
 +        <feature version='${mdsal.version}'>odl-mdsal-apidocs</feature>
+         <bundle>mvn:org.apache.commons/commons-lang3/{{VERSION}}</bundle>
+         <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.lisp-proto/{{VERSION}}</bundle>
+         <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.api/{{VERSION}}</bundle>
      </feature>
  
+     <feature name="odl-lispflowmapping-mappingservice-shell" description="OpenDaylight :: LISP Flow Mapping :: Mappingservice Shell" version='${project.version}'>
+         <feature version="${project.version}">odl-lispflowmapping-mappingservice</feature>
+         <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.shell/{{VERSION}}</bundle>
+     </feature>
  </features>

diff --cc mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mapcache/FlatMapCache.java
Simple merge

diff --cc mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mapcache/MultiTableMapCache.java
Simple merge

diff --cc mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mapcache/SimpleMapCache.java
Simple merge