Merge remote branch 'origin/release-1.0.X' into mer 00/4800/1
authorDavid Goldberg <david.goldberg@contextream.com>
Fri, 24 Jan 2014 05:42:16 +0000 (07:42 +0200)
committerDavid Goldberg <david.goldberg@contextream.com>
Fri, 24 Jan 2014 05:42:23 +0000 (07:42 +0200)
commit1f3fd2dc35483f97ba10f9cff4a064e1e2443eea
treea0f2ad53e01e2e18320ea9044852c9cf162bc6f1
parent446cc2a1f1abb3aaeab1a670eea73cf922b2f24c
parent038711d7ec673db189f008f22c252cea2f33cf02
Merge remote branch 'origin/release-1.0.X' into mer

Conflicts:
mappingservice/integrationtest/pom.xml

Change-Id: I62fc34b7c566198dc62ee1d20026ded5e579f303
Signed-off-by: David Goldberg <david.goldberg@contextream.com>
commons/code-parent/pom.xml
commons/parent/pom.xml
commons/unittest_tools/pom.xml
mappingservice/api/pom.xml
mappingservice/config/pom.xml
mappingservice/implementation/pom.xml
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/LispNotificationHelper.java
mappingservice/integrationtest/pom.xml
mappingservice/northbound/pom.xml
mappingservice/pom.xml
mappingservice/southbound/pom.xml