Merge branch 'master' into topic/ietf_yang 88/28288/1
authorLorand Jakab <lojakab@cisco.com>
Mon, 12 Oct 2015 14:10:24 +0000 (17:10 +0300)
committerLorand Jakab <lojakab@cisco.com>
Mon, 12 Oct 2015 14:15:53 +0000 (17:15 +0300)
commit9f53c62f84b66eac6fbded68018e11f2e3549b3c
treeb8d36b2b3eb534f1863016c265535e8882b2a11b
parent770828c6c8e6282e91e39fdf76b5aa4b09ef7ddd
parenta73c1e00f86287d4201164468f469b5f7b8bb226
Merge branch 'master' into topic/ietf_yang

Change-Id: I489ceff034e498cff459393c7284370710dc12c6
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
features/pom.xml
features/src/main/features/features.xml
mappingservice/lisp-proto/pom.xml
mappingservice/pom.xml