Fix merge conflict Commits fcc2d81 and 1335af3 conflicted.
Change-Id: Ia5444d6b44b9aeea18f7861849513a2bde5c881f Reviewed-on: http://gerrit.cloudera.org:8080/5967 Reviewed-by: Bharath Vissapragada <[email protected]> Reviewed-by: Dimitris Tsirogiannis <[email protected]> Tested-by: Impala Public Jenkins Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/6242478d Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/6242478d Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/6242478d Branch: refs/heads/master Commit: 6242478d0c06c8ee92310632a4903e56e50fe40a Parents: d2d3f4c Author: Dan Hecht <[email protected]> Authored: Fri Feb 10 09:32:06 2017 -0800 Committer: Impala Public Jenkins <[email protected]> Committed: Fri Feb 10 21:34:54 2017 +0000 ---------------------------------------------------------------------- common/thrift/generate_error_codes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/6242478d/common/thrift/generate_error_codes.py ---------------------------------------------------------------------- diff --git a/common/thrift/generate_error_codes.py b/common/thrift/generate_error_codes.py index fe001e5..4c32768 100755 --- a/common/thrift/generate_error_codes.py +++ b/common/thrift/generate_error_codes.py @@ -309,7 +309,7 @@ error_codes = ( # TODO: IMPALA-4697: the merged errors do not show up in the query error log, # so we must point users to the impalad error log. - ("SCRATCH_ALLOCATION_FAILED", 102, "Could not create files in any configured scratch " + ("SCRATCH_ALLOCATION_FAILED", 101, "Could not create files in any configured scratch " "directories (--scratch_dirs). See logs for previous errors that may have prevented " "creating or writing scratch files."), )
