Merge commit 'refs/changes/20/18320/1' of ssh://git.opendaylight.org:29418/alto 35/18335/2
authorEmiapwil (Gao Kai) <gaok12@mails.tsinghua.edu.cn>
Wed, 15 Apr 2015 12:18:54 +0000 (20:18 +0800)
committerEmiapwil (Gao Kai) <gaok12@mails.tsinghua.edu.cn>
Wed, 15 Apr 2015 12:35:53 +0000 (20:35 +0800)
commit388f9652060cc3300dc7bc698e2ab52b0fc0dd1c
tree5b283f3a7e1bfa850ee8748b0a2662d8b1d2e472
parent0b7ad2930869d77a613cf084fc9a1fe8ec160bf9
Merge commit 'refs/changes/20/18320/1' of ssh://git.opendaylight.org:29418/alto

Taken care of the checkstyle errors as well.

Change-Id: I3c744aaa8ee3cbb3987242830ff03a242af3ac0a
Signed-off-by: Emiapwil (Gao Kai) <gaok12@mails.tsinghua.edu.cn>
31 files changed:
alto-commons/pom.xml
alto-commons/src/main/java/org/opendaylight/alto/commons/types/convertor/Model2RFCConvertor.java
alto-commons/src/main/java/org/opendaylight/alto/commons/types/convertor/RFC2ModelConvertor.java
alto-commons/src/main/java/org/opendaylight/alto/commons/types/model150404/JSONMapper.java
alto-commons/src/main/java/org/opendaylight/alto/commons/types/model150404/ModelType.java
alto-commons/src/main/java/org/opendaylight/alto/commons/types/rfc7285/Endpoint.java
alto-commons/src/main/java/org/opendaylight/alto/commons/types/rfc7285/FormatValidator.java
alto-commons/src/main/java/org/opendaylight/alto/commons/types/rfc7285/JSONMapper.java
alto-commons/src/main/java/org/opendaylight/alto/commons/types/rfc7285/RFC7285Type.java
alto-config/pom.xml
alto-manager/pom.xml
alto-manager/src/main/java/org/opendaylight/alto/manager/AltoManager.java
alto-manager/src/main/java/org/opendaylight/alto/manager/AltoManagerConstants.java
alto-manager/src/test/java/org/opendaylight/alto/AppTest.java
alto-model/pom.xml
alto-northbound/pom.xml
alto-northbound/src/main/java/org/opendaylight/alto/northbound/AltoNorthbound.java
alto-northbound/src/main/java/org/opendaylight/alto/northbound/exception/AltoBasicException.java
alto-provider/pom.xml
alto-provider/src/main/java/org/opendaylight/alto/provider/AltoProvider.java
alto-provider/src/main/java/org/opendaylight/controller/config/yang/config/alto_provider/impl/AltoProviderModule.java
alto-services/api/pom.xml
alto-services/api/rfc7285/pom.xml
alto-services/api/rfc7285/src/main/java/org/opendaylight/alto/services/api/rfc7285/CostMapService.java
alto-services/ext/fake/pom.xml
alto-services/ext/fake/src/main/java/org/opendaylight/alto/services/ext/fake/FakeAltoService.java
alto-services/ext/fs-map/pom.xml
alto-services/ext/pom.xml
alto-services/provider/pom.xml
features/pom.xml
pom.xml