Code Review / lispflowmapping.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 489055f 0b30a02)
Merge branch 'release-1.0.X' into develop 18/5618/1
authorLorand Jakab <lojakab@cisco.com>
Wed, 12 Mar 2014 19:51:19 +0000 (21:51 +0200)
committerLorand Jakab <lojakab@cisco.com>
Wed, 12 Mar 2014 19:51:19 +0000 (21:51 +0200)
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
1  2 
mappingservice/api/pom.xml patch | diff1 | diff2 | blob | history

diff --cc mappingservice/api/pom.xml
Simple merge
OpenDaylight LISP Mapping Service