impala-reviews mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Impala Public Jenkins (Code Review)" <ger...@cloudera.org>
Subject [Impala-ASF-CR] Fix merge conflict
Date Fri, 10 Feb 2017 21:34:54 GMT
Impala Public Jenkins has submitted this change and it was merged.

Change subject: Fix merge conflict
......................................................................


Fix merge conflict

Commits fcc2d81 and 1335af3 conflicted.

Change-Id: Ia5444d6b44b9aeea18f7861849513a2bde5c881f
Reviewed-on: http://gerrit.cloudera.org:8080/5967
Reviewed-by: Bharath Vissapragada <bharathv@cloudera.com>
Reviewed-by: Dimitris Tsirogiannis <dtsirogiannis@cloudera.com>
Tested-by: Impala Public Jenkins
---
M common/thrift/generate_error_codes.py
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Impala Public Jenkins: Verified
  Bharath Vissapragada: Looks good to me, but someone else must approve
  Dimitris Tsirogiannis: Looks good to me, approved



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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia5444d6b44b9aeea18f7861849513a2bde5c881f
Gerrit-PatchSet: 2
Gerrit-Project: Impala-ASF
Gerrit-Branch: master
Gerrit-Owner: Dan Hecht <dhecht@cloudera.com>
Gerrit-Reviewer: Bharath Vissapragada <bharathv@cloudera.com>
Gerrit-Reviewer: Dimitris Tsirogiannis <dtsirogiannis@cloudera.com>
Gerrit-Reviewer: Impala Public Jenkins

Mime
View raw message