Merge "Add updateGlobalPropertiesJson controller"

author Adam Krysiak <adam.krysiak@nokia.com>

Wed, 13 Mar 2019 08:10:33 +0000 (08:10 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Wed, 13 Mar 2019 08:10:33 +0000 (08:10 +0000)
author Adam Krysiak <adam.krysiak@nokia.com>
Wed, 13 Mar 2019 08:10:33 +0000 (08:10 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Wed, 13 Mar 2019 08:10:33 +0000 (08:10 +0000)
diff --cc src/main/resources/clds/camel/rest/clamp-api-v2.xml
Simple merge
author	Adam Krysiak <adam.krysiak@nokia.com>
	Wed, 13 Mar 2019 08:10:33 +0000 (08:10 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Wed, 13 Mar 2019 08:10:33 +0000 (08:10 +0000)