Fixed merge issues 87/35687/1
authorIdan Amit <ia096e@intl.att.com>
Wed, 14 Mar 2018 07:59:41 +0000 (09:59 +0200)
committerIdan Amit <ia096e@intl.att.com>
Wed, 14 Mar 2018 07:59:41 +0000 (09:59 +0200)
commita65b55d5519e79b3291699b9289eb96d1ac884a5
treeb988d5c4fcfe8922a66e2f4ac161ffe84dd7faa7
parentfad1d735d7ac3896e28277c733920d15e105db6e
Fixed merge issues

Changed dmaapClient version to release version

Change-Id: I470c2da26f0a3412af37c24781e1fbc072d7547c
Issue-ID: SDC-1126
Signed-off-by: Idan Amit <ia096e@intl.att.com>
catalog-be/pom.xml