Dan Hecht has uploaded a new change for review. http://gerrit.cloudera.org:8080/5967
Change subject: Fix merge conflict ...................................................................... Fix merge conflict Commits fcc2d81 and 1335af3 conflicted. Change-Id: Ia5444d6b44b9aeea18f7861849513a2bde5c881f --- M common/thrift/generate_error_codes.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.cloudera.org:29418/Impala-ASF refs/changes/67/5967/1 -- To view, visit http://gerrit.cloudera.org:8080/5967 To unsubscribe, visit http://gerrit.cloudera.org:8080/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia5444d6b44b9aeea18f7861849513a2bde5c881f Gerrit-PatchSet: 1 Gerrit-Project: Impala-ASF Gerrit-Branch: master Gerrit-Owner: Dan Hecht <dhe...@cloudera.com>
