kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ij...@apache.org
Subject kafka git commit: MINOR: Fix testUniqueErrorCodes unit test failure
Date Thu, 21 Sep 2017 07:34:23 GMT
Repository: kafka
Updated Branches:
  refs/heads/trunk 5f6393f9b -> b12ba240e


MINOR: Fix testUniqueErrorCodes unit test failure

Error code collision due to incorrect merge
conflict resolution after 2 PRs were merged in
quick succession.

Author: James Cheng <jylcheng@yahoo.com>

Reviewers: Ismael Juma <ismael@juma.me.uk>

Closes #3931 from wushujames/KAFKA-5856.buildfix


Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/b12ba240
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/b12ba240
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/b12ba240

Branch: refs/heads/trunk
Commit: b12ba240e95eacd514bf79e029fbc6b9ed1a1a67
Parents: 5f6393f
Author: James Cheng <jylcheng@yahoo.com>
Authored: Thu Sep 21 08:31:57 2017 +0100
Committer: Ismael Juma <ismael@juma.me.uk>
Committed: Thu Sep 21 08:32:14 2017 +0100

----------------------------------------------------------------------
 clients/src/main/java/org/apache/kafka/common/protocol/Errors.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/b12ba240/clients/src/main/java/org/apache/kafka/common/protocol/Errors.java
----------------------------------------------------------------------
diff --git a/clients/src/main/java/org/apache/kafka/common/protocol/Errors.java b/clients/src/main/java/org/apache/kafka/common/protocol/Errors.java
index 1584238..160ca26 100644
--- a/clients/src/main/java/org/apache/kafka/common/protocol/Errors.java
+++ b/clients/src/main/java/org/apache/kafka/common/protocol/Errors.java
@@ -538,7 +538,7 @@ public enum Errors {
                 return new UnknownProducerIdException(message);
             }
     }),
-    REASSIGNMENT_IN_PROGRESS(59, "A partition reassignment is in progress",
+    REASSIGNMENT_IN_PROGRESS(60, "A partition reassignment is in progress",
         new ApiExceptionBuilder() {
             @Override
             public ApiException build(String message) {


Mime
View raw message