git.opendaylight Code Review - lispflowmapping.git/commit

Code Review / lispflowmapping.git / commit

author	Lorand Jakab <lojakab@cisco.com>
	Tue, 21 Jan 2014 17:28:38 +0000 (19:28 +0200)
committer	Lorand Jakab <lojakab@cisco.com>
	Tue, 21 Jan 2014 18:27:13 +0000 (20:27 +0200)
commit	09cac05a8a47160abfc258c76f4ae8c6ca42d179
tree	1198ebf567a8286e064fedcfbb573cba948bbbef	tree \| snapshot
parent	33ac396542a2df245ddbe54520dbff5c308b15c4	commit \| diff
parent	d446dd1083ebff53f453a9235753388580ed935b	commit \| diff

Merge branch 'release-1.0.X' into develop

Conflicts:
commons/code-parent/pom.xml
mappingservice/api/pom.xml
mappingservice/implementation/pom.xml
mappingservice/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java
mappingservice/northbound/pom.xml
mappingservice/northbound/src/main/java/org/opendaylight/lispflowmapping/northbound/LispMappingNorthbound.java
mappingservice/southbound/pom.xml

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

16 files changed:

commons/parent/pom.xml	diff1 \|	diff2 \|	blob \| history
commons/unittest_tools/pom.xml	diff1 \|	diff2 \|	blob \| history
mappingservice/api/pom.xml	diff1 \|	diff2 \|	blob \| history
mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/lisp/IMapRequestResultHandler.java	diff1 \|	diff2 \|	blob \| history
mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/lisp/IMapResolverAsync.java	diff1 \|	diff2 \|	blob \| history
mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/type/sbplugin/ILispSouthboundPlugin.java	diff1 \|	diff2 \|	blob \| history
mappingservice/config/pom.xml	diff1 \|	diff2 \|	blob \| history
mappingservice/implementation/pom.xml	diff1 \|	diff2 \|	blob \| history
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/LispMappingService.java	diff1 \|	diff2 \|	blob \| history
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolver.java	diff1 \|	diff2 \|	blob \| history
mappingservice/integrationtest/pom.xml	diff1 \|	diff2 \|	blob \| history
mappingservice/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java	diff1 \|	diff2 \|	blob \| history
mappingservice/integrationtest/src/test/resources/logback.xml	diff1 \|	diff2 \|	blob \| history
mappingservice/northbound/pom.xml	diff1 \|	diff2 \|	blob \| history
mappingservice/southbound/pom.xml	diff1 \|	diff2 \|	blob \| history
mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundPlugin.java	diff1 \|	diff2 \|	blob \| history

OpenDaylight LISP Mapping Service

RSS Atom

commons/parent/pom.xml	diff1 \|	diff2 \|	blob \| history
commons/unittest_tools/pom.xml	diff1 \|	diff2 \|	blob \| history
mappingservice/api/pom.xml	diff1 \|	diff2 \|	blob \| history
mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/lisp/IMapRequestResultHandler.java	diff1 \|	diff2 \|	blob \| history
mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/lisp/IMapResolverAsync.java	diff1 \|	diff2 \|	blob \| history
mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/type/sbplugin/ILispSouthboundPlugin.java	diff1 \|	diff2 \|	blob \| history
mappingservice/config/pom.xml	diff1 \|	diff2 \|	blob \| history
mappingservice/implementation/pom.xml	diff1 \|	diff2 \|	blob \| history
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/LispMappingService.java	diff1 \|	diff2 \|	blob \| history
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolver.java	diff1 \|	diff2 \|	blob \| history
mappingservice/integrationtest/pom.xml	diff1 \|	diff2 \|	blob \| history
mappingservice/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java	diff1 \|	diff2 \|	blob \| history
mappingservice/integrationtest/src/test/resources/logback.xml	diff1 \|	diff2 \|	blob \| history
mappingservice/northbound/pom.xml	diff1 \|	diff2 \|	blob \| history
mappingservice/southbound/pom.xml	diff1 \|	diff2 \|	blob \| history
mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundPlugin.java	diff1 \|	diff2 \|	blob \| history