Merge "Remove the root user id to use default user"

author Mike Elliott <mike.elliott@amdocs.com>

Thu, 5 Oct 2017 18:49:51 +0000 (18:49 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Thu, 5 Oct 2017 18:49:51 +0000 (18:49 +0000)
author Mike Elliott <mike.elliott@amdocs.com>
Thu, 5 Oct 2017 18:49:51 +0000 (18:49 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Thu, 5 Oct 2017 18:49:51 +0000 (18:49 +0000)
diff --cc templates/aai-resources-deployment.yaml
Simple merge
diff --cc templates/aai-traversal-deployment.yaml
Simple merge
author	Mike Elliott <mike.elliott@amdocs.com>
	Thu, 5 Oct 2017 18:49:51 +0000 (18:49 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Thu, 5 Oct 2017 18:49:51 +0000 (18:49 +0000)
		1	2
templates/aai-resources-deployment.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
templates/aai-traversal-deployment.yaml	patch \|	diff1 \|	diff2 \|	blob \| history