Merge master code to casablanca branch 98/73698/1
authorzhangab <zhanganbing@chinamobile.com>
Tue, 27 Nov 2018 16:12:28 +0000 (00:12 +0800)
committerzhangab <zhanganbing@chinamobile.com>
Tue, 27 Nov 2018 16:12:29 +0000 (00:12 +0800)
commitdb9330941ed6cb9e3c0fe943a0eab0fc7e88c126
tree970b9ccd0ea7d80c836904edf662378392f03ee7
parent23c19d870b84a9c8b3a97c10150593be94c4a77e
Merge master code to casablanca branch

Change-Id: I1208f4e3e74b7b3700f71940d340473f587fe907
Issue-ID: USECASEUI-153
Signed-off-by: zhangab <zhanganbing@chinamobile.com>
15 files changed:
pom.xml
server/pom.xml
server/src/main/java/org/onap/usecaseui/server/controller/lcm/PackageDistributionController.java
server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceLcmController.java
server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceTemplateController.java
server/src/main/java/org/onap/usecaseui/server/controller/sotn/SotnController.java
server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/AAIService.java
server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/SOService.java
server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultPackageDistributionService.java
server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceInstanceService.java
server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceLcmService.java
server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceTemplateService.java
standalone/pom.xml
standalone/src/main/assembly/resources/dbscripts/mysql/usecase-ui-createobj.sql
version.properties