Merge "Update log path to get filebeat working"

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

Mon, 7 May 2018 21:16:01 +0000 (21:16 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Mon, 7 May 2018 21:16:01 +0000 (21:16 +0000)
author Mike Elliott <mike.elliott@amdocs.com>
Mon, 7 May 2018 21:16:01 +0000 (21:16 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Mon, 7 May 2018 21:16:01 +0000 (21:16 +0000)
diff --cc kubernetes/aai/charts/aai-resources/templates/deployment.yaml
Simple merge
diff --cc kubernetes/aai/charts/aai-traversal/templates/deployment.yaml
Simple merge
author	Mike Elliott <mike.elliott@amdocs.com>
	Mon, 7 May 2018 21:16:01 +0000 (21:16 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Mon, 7 May 2018 21:16:01 +0000 (21:16 +0000)
		1	2
kubernetes/aai/charts/aai-resources/templates/deployment.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
kubernetes/aai/charts/aai-traversal/templates/deployment.yaml	patch \|	diff1 \|	diff2 \|	blob \| history