Merge remote-tracking branch 'origin/dublin' into 'origin/master' 81/90481/1
authorBenjamin, Max (mb388a) <mb388a@us.att.com>
Tue, 25 Jun 2019 19:52:39 +0000 (15:52 -0400)
committerBenjamin, Max (mb388a) <mb388a@us.att.com>
Tue, 25 Jun 2019 19:54:42 +0000 (15:54 -0400)
commit93bc7a00350d6ed250b26d47d5bd28147c591523
tree43c4cd31cb8cd43759b2c4e27f9a0a7fe6c7da33
parentf417537f5258530ed15ceaec111ce08a24ad6487
parentac2b66be54faa91e6269e2ca4d2b5c08e8273feb
Merge remote-tracking branch 'origin/dublin' into 'origin/master'

Change-Id: I2b91332563d9c7b0f469c9e45a35cc1376465c5e
Issue-ID: SO-2058
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
adapters/mso-catalog-db-adapter/src/main/resources/db/migration/R__MacroData.sql
asdc-controller/src/main/java/org/onap/so/asdc/installer/bpmn/WorkflowResource.java
asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java
bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java