[Impala-ASF-CR] Resolve merge conflict from IMPALA-10645

["Joe McDonnell (Code Review)" <ge...@cloudera.org>]

Joe McDonnell has submitted this change and it was merged. ( http://gerrit.cloudera.org:8080/18564 )

Change subject: Resolve merge conflict from IMPALA-10645
......................................................................

Resolve merge conflict from IMPALA-10645

Change-Id: Ic8d693af43e28c5834ca56654afbc8e711def117
Reviewed-on: http://gerrit.cloudera.org:8080/18564
Reviewed-by: Joe McDonnell <jo...@cloudera.com>
Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
M fe/src/main/java/org/apache/impala/catalog/metastore/CatalogMetastoreServer.java
1 file changed, 0 insertions(+), 5 deletions(-)

Approvals:
  Joe McDonnell: Looks good to me, approved
  Impala Public Jenkins: Verified

-- 
To view, visit http://gerrit.cloudera.org:8080/18564
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings

Gerrit-Project: Impala-ASF
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8d693af43e28c5834ca56654afbc8e711def117
Gerrit-Change-Number: 18564
Gerrit-PatchSet: 2
Gerrit-Owner: Michael Smith <mi...@cloudera.com>
Gerrit-Reviewer: Impala Public Jenkins <im...@cloudera.com>
Gerrit-Reviewer: Joe McDonnell <jo...@cloudera.com>
Gerrit-Reviewer: Michael Smith <mi...@cloudera.com>