[SECIOTSRK-663] *Dockerization of services: resolve merge conflict
authorm.dalakov <m.dalakov@samsung.com>
Fri, 3 Nov 2017 19:54:11 +0000 (21:54 +0200)
committerm.dalakov <m.dalakov@samsung.com>
Fri, 3 Nov 2017 19:54:11 +0000 (21:54 +0200)
commit3cbf7b824bca9bd58fb9cfb32db94c51f6e83770
tree47a8ad46ac01bd54e7cbcad53a26b161f9e1c04c
parent09a1306c7900231b1570ee908b7aa86f9a92fbd8
parent81608401458e2b39fe9a09c155c03016f9476b06
[SECIOTSRK-663] *Dockerization of services: resolve merge conflict
servers/alive/pom.xml
servers/alive/src/main/java/com/samsung/alive/service/impl/CloudServiceImpl.java
servers/api-integration-tests/pom.xml
servers/dsm/pom.xml
servers/mq/pom.xml
servers/pom.xml