Repository: impala Updated Branches: refs/heads/2.x e7d48a3da -> 228f07722
Ignore IMPALA-6131 which has already been picked IMPALA-6131 was already cherry-picked to 2.x, but with a different Change-Id than in master. Change-Id: I44b32a323acf0cd15a89599a28b1fb0922bd7911 Reviewed-on: http://gerrit.cloudera.org:8080/10516 Tested-by: Joe McDonnell <[email protected]> Reviewed-by: Thomas Marshall <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/impala/repo Commit: http://git-wip-us.apache.org/repos/asf/impala/commit/228f0772 Tree: http://git-wip-us.apache.org/repos/asf/impala/tree/228f0772 Diff: http://git-wip-us.apache.org/repos/asf/impala/diff/228f0772 Branch: refs/heads/2.x Commit: 228f077221c140bbe1e17d80b87e7fe10a488abf Parents: e7d48a3 Author: Joe McDonnell <[email protected]> Authored: Fri May 25 09:28:37 2018 -0700 Committer: Joe McDonnell <[email protected]> Committed: Fri May 25 23:16:00 2018 +0000 ---------------------------------------------------------------------- bin/ignored_commits.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/impala/blob/228f0772/bin/ignored_commits.json ---------------------------------------------------------------------- diff --git a/bin/ignored_commits.json b/bin/ignored_commits.json index 8365419..3ad6860 100644 --- a/bin/ignored_commits.json +++ b/bin/ignored_commits.json @@ -28,7 +28,9 @@ { "hash": "8668d18ebb0e137993a12d5303411b6c06e91c59", "comment": "Not applicable to 2.x: 3.x version update" }, { "hash": "13a1acd7e42b533c39b9f4eea1c17823bde4c1c5", - "comment": "Not applicable to 2.x: 3.x erasure coding"} + "comment": "Not applicable to 2.x: 3.x erasure coding"}, + { "hash": "5c7d3b12e3aa750e7ab88e3ef1092d5218e53cc2", + "comment": "IMPALA-6131: Already picked with a different Change-Id than master"} ] } ]
