Merge "Synchronization fix for dmaap client"

author Seshu Kumar M <seshu.kumar.m@huawei.com>

Thu, 19 Apr 2018 09:46:07 +0000 (09:46 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Thu, 19 Apr 2018 09:46:07 +0000 (09:46 +0000)
author Seshu Kumar M <seshu.kumar.m@huawei.com>
Thu, 19 Apr 2018 09:46:07 +0000 (09:46 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Thu, 19 Apr 2018 09:46:07 +0000 (09:46 +0000)
diff --cc bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/applicationContext.xml
Simple merge
author	Seshu Kumar M <seshu.kumar.m@huawei.com>
	Thu, 19 Apr 2018 09:46:07 +0000 (09:46 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Thu, 19 Apr 2018 09:46:07 +0000 (09:46 +0000)