Merge commit 1c13d97c001c2830d6534ef96b9cb6111c181c49 71/19371/1
authorGao Kai <gaok12@mails.tsinghua.edu.cn>
Thu, 30 Apr 2015 09:33:21 +0000 (17:33 +0800)
committerGao Kai <gaok12@mails.tsinghua.edu.cn>
Thu, 30 Apr 2015 09:33:21 +0000 (17:33 +0800)
commit4999388c57231143769c6fc7989da60f97552b95
tree1c9556bccbaadb1e84c62ef00c2ba8f9e293204d
parentd89dfe7bf627b6c18fb766bb3e1d12d21d3a0eec
Merge commit 1c13d97c001c2830d6534ef96b9cb6111c181c49

Add back alto-karaf to test alto-features.

Change-Id: Idfc97c7fa9bd398d60317f4efbf27a586237aa23
Signed-off-by: Gao Kai <gaok12@mails.tsinghua.edu.cn>
19 files changed:
alto-commons/pom.xml
alto-commons/src/main/java/org/opendaylight/alto/commons/types/converter/RFC2ModelNetworkMapConverter.java
alto-commons/src/main/java/org/opendaylight/alto/commons/types/converter/RFC2ModelNetworkMapDataConverter.java
alto-commons/src/main/java/org/opendaylight/alto/commons/types/model150404/MediaType.java
alto-commons/src/main/java/org/opendaylight/alto/commons/types/model150404/ModelEndpointAddressGroup.java
alto-commons/src/main/java/org/opendaylight/alto/commons/types/model150404/ModelJSONMapper.java
alto-karaf/pom.xml [new file with mode: 0644]
alto-manager/pom.xml
alto-manager/src/main/java/org/opendaylight/alto/manager/AltoCreate.java [new file with mode: 0644]
alto-manager/src/main/java/org/opendaylight/alto/manager/AltoDelete.java [new file with mode: 0644]
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/main/java/org/opendaylight/alto/manager/AltoSet.java [new file with mode: 0644]
alto-manager/src/main/resources/OSGI-INF/blueprint/config.xml
alto-manager/src/main/resources/default.networkmap [deleted file]
alto-model/src/main/yang/alto-service-types.yang
features/pom.xml
features/src/main/resources/features.xml
pom.xml