Merge remote branch 'origin/release-1.0.X' into develop 19/5119/2
authorDavid Goldberg <david.goldberg@contextream.com>
Tue, 4 Feb 2014 13:45:08 +0000 (15:45 +0200)
committerDavid Goldberg <david.goldberg@contextream.com>
Tue, 4 Feb 2014 13:48:52 +0000 (15:48 +0200)
commit9877c913179d2dd795a8eb96b1c5031e15c75854
treeed3a9ed46b37aeb3133aacbf6e364fc4a76100e6
parentd92d6232211c551ad59839061f817697df5d2987
parent19dd4beb38b1e7775953787b4841ffc49b5c0b5b
Merge remote branch 'origin/release-1.0.X' into develop

Conflicts:
commons/build_tools/pom.xml
commons/code-parent/pom.xml
commons/parent/pom.xml
commons/unittest_tools/pom.xml
distribution/pom.xml
mappingservice/api/pom.xml
mappingservice/config/pom.xml
mappingservice/implementation/pom.xml
mappingservice/integrationtest/pom.xml
mappingservice/northbound/pom.xml
mappingservice/pom.xml
mappingservice/southbound/pom.xml
mappingservice/yangmodel/pom.xml
pom.xml

Change-Id: Ib337f52ac76acfd7eb85c8f667b192c64c177fb2
Signed-off-by: David Goldberg <david.goldberg@contextream.com>
12 files changed:
commons/build_tools/pom.xml
commons/code-parent/pom.xml
commons/unittest_tools/pom.xml
distribution/pom.xml
mappingservice/api/pom.xml
mappingservice/implementation/pom.xml
mappingservice/integrationtest/pom.xml
mappingservice/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java
mappingservice/neutron/pom.xml
mappingservice/northbound/pom.xml
mappingservice/pom.xml
mappingservice/yangmodel/pom.xml