You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ha...@apache.org on 2017/06/26 05:08:12 UTC

zookeeper git commit: Fix branch-3.5 build break caused by missing import of org.apache.zookeeper.server.auth.AuthenticationProvider. Commit 6e1357bb98ee9b6d0fd68169502cf46c89cbd5c2 removed import org.apache.zookeeper.server.auth.AuthenticationProvider f

Repository: zookeeper
Updated Branches:
  refs/heads/branch-3.5 6e1357bb9 -> 749b6024b


Fix branch-3.5 build break caused by missing import of org.apache.zookeeper.server.auth.AuthenticationProvider.
Commit 6e1357bb98ee9b6d0fd68169502cf46c89cbd5c2 removed import org.apache.zookeeper.server.auth.AuthenticationProvider from various files, however this only works for master branch. For branch-3.5 both imports are needed. This commit brought this import back and fixed the build break for branch=3.5.


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

Branch: refs/heads/branch-3.5
Commit: 749b6024b7547b697fa3916639e0480c271a7017
Parents: 6e1357b
Author: Michael Han <ha...@apache.org>
Authored: Sun Jun 25 22:08:03 2017 -0700
Committer: Michael Han <ha...@apache.org>
Committed: Sun Jun 25 22:08:03 2017 -0700

----------------------------------------------------------------------
 src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java | 1 +
 src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java      | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zookeeper/blob/749b6024/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java b/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java
index 42a1669..aa4594c 100644
--- a/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java
+++ b/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java
@@ -42,6 +42,7 @@ import org.apache.zookeeper.proto.ReconfigRequest;
 import org.apache.zookeeper.proto.SetACLRequest;
 import org.apache.zookeeper.proto.SetDataRequest;
 import org.apache.zookeeper.server.ZooKeeperServer.ChangeRecord;
+import org.apache.zookeeper.server.auth.AuthenticationProvider;
 import org.apache.zookeeper.server.auth.ProviderRegistry;
 import org.apache.zookeeper.server.quorum.Leader.XidRolloverException;
 import org.apache.zookeeper.server.quorum.LeaderZooKeeperServer;

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/749b6024/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java b/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java
index 6e4f60a..0bdd8c0 100644
--- a/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java
+++ b/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java
@@ -61,6 +61,7 @@ import org.apache.zookeeper.server.RequestProcessor.RequestProcessorException;
 import org.apache.zookeeper.server.ServerCnxn.CloseRequestException;
 import org.apache.zookeeper.server.SessionTracker.Session;
 import org.apache.zookeeper.server.SessionTracker.SessionExpirer;
+import org.apache.zookeeper.server.auth.AuthenticationProvider;
 import org.apache.zookeeper.server.auth.ProviderRegistry;
 import org.apache.zookeeper.server.persistence.FileTxnSnapLog;
 import org.apache.zookeeper.server.quorum.ReadOnlyZooKeeperServer;