Repository: impala Updated Branches: refs/heads/2.x ff38d6299 -> 18823f6b4
IMPALA-6405: Ignore commit for automatic cherry picking The fix for IMPALA-6405 failed to cherry-pick cleanly. This change exempts the commit from being picked automatically to unblock automatic cherry picking. I prepared a manual pick here: https://gerrit.cloudera.org/#/c/9530/ I tested this by running ./bin/compare_branches.py making sure that the offending commit is not in the list. Change-Id: I9736830de3f22452a7d1eb9e9d01fc6ccd0b2144 Reviewed-on: http://gerrit.cloudera.org:8080/9531 Reviewed-by: Philip Zeyliger <phi...@cloudera.com> Tested-by: Philip Zeyliger <phi...@cloudera.com> Project: http://git-wip-us.apache.org/repos/asf/impala/repo Commit: http://git-wip-us.apache.org/repos/asf/impala/commit/18823f6b Tree: http://git-wip-us.apache.org/repos/asf/impala/tree/18823f6b Diff: http://git-wip-us.apache.org/repos/asf/impala/diff/18823f6b Branch: refs/heads/2.x Commit: 18823f6b4f9856605a85ec125d32abb8fd0b6fd7 Parents: ff38d62 Author: Lars Volker <l...@cloudera.com> Authored: Wed Mar 7 11:25:05 2018 -0800 Committer: Lars Volker <l...@cloudera.com> Committed: Wed Mar 7 19:31:30 2018 +0000 ---------------------------------------------------------------------- bin/ignored_commits.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/impala/blob/18823f6b/bin/ignored_commits.json ---------------------------------------------------------------------- diff --git a/bin/ignored_commits.json b/bin/ignored_commits.json index fe51488..b5f23b4 100644 --- a/bin/ignored_commits.json +++ b/bin/ignored_commits.json @@ -1 +1,10 @@ -[] +[ + { + "source": "master", + "target": "2.x", + "commits": [ + { "hash": "b0027575cbce7002ff867750e955ff3ecd3b1bcd", + "comment": "IMPALA-6405, change required manual cherry pick." } + ] + } +]
