tree 7c1681e3a14fd9453d307ef662e94bbcaf8f014a
parent b2dbbf5b12c4fcb2d58308f04e4dd37d97c2a68d
parent 4e5e6220dfdf63397ddba0df87b7a0cd0d2c947a
author Matteo Scandolo <teo@onlab.us> 1475281208 -0700
committer Gerrit Code Review <gerrit@localhost> 1475281208 -0700

Merge "Updated TOSCA to match new service definition"