Merge "changes for kafka upgrade"

author Ram Koya <rk541m@att.com>

Wed, 20 Jun 2018 21:24:37 +0000 (21:24 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Wed, 20 Jun 2018 21:24:37 +0000 (21:24 +0000)
author Ram Koya <rk541m@att.com>
Wed, 20 Jun 2018 21:24:37 +0000 (21:24 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Wed, 20 Jun 2018 21:24:37 +0000 (21:24 +0000)
diff --cc src/main/java/com/att/nsa/dmaapMMAgent/dao/CreateMirrorMaker.java
Simple merge
diff --cc src/main/java/com/att/nsa/dmaapMMAgent/utils/MirrorMakerProcessHandler.java
Simple merge
author	Ram Koya <rk541m@att.com>
	Wed, 20 Jun 2018 21:24:37 +0000 (21:24 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Wed, 20 Jun 2018 21:24:37 +0000 (21:24 +0000)
		1	2
src/main/java/com/att/nsa/dmaapMMAgent/dao/CreateMirrorMaker.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/main/java/com/att/nsa/dmaapMMAgent/utils/MirrorMakerProcessHandler.java	patch \|	diff1 \|	diff2 \|	blob \| history