Merge branch 'master' into topic/ietf_yang 47/29847/1
authorLorand Jakab <lojakab@cisco.com>
Wed, 18 Nov 2015 11:04:12 +0000 (13:04 +0200)
committerLorand Jakab <lojakab@cisco.com>
Wed, 18 Nov 2015 11:04:48 +0000 (13:04 +0200)
commit290193fe0d11463d68c92e29598716ed6158ab8e
treee4fb17531dbde8ace0427652b0d2dfc3a1305393
parentd41a73949b40291991c0ceeb8dfe556310b070e7
parent4f480181d7f07fb1f83517cadb8c0d0252c3b363
Merge branch 'master' into topic/ietf_yang

Change-Id: I7cb3bb7f8f6423db3bf51e0b49e66a4472d2c03a
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
features/src/main/features/features.xml
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mapcache/FlatMapCache.java
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mapcache/MultiTableMapCache.java
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mapcache/SimpleMapCache.java