You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by dl...@apache.org on 2015/04/30 00:20:30 UTC
[1/2] accumulo git commit: ACCUMULO-3762: Add case for ephemeral nodes
Repository: accumulo
Updated Branches:
refs/heads/1.7 c55fe3eb6 -> ef2e31af3
ACCUMULO-3762: Add case for ephemeral nodes
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/67c8b2b6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/67c8b2b6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/67c8b2b6
Branch: refs/heads/1.7
Commit: 67c8b2b677b7e29eeb761954ba16d111b4939562
Parents: bc87145
Author: Dave Marion <dl...@hotmail.com>
Authored: Wed Apr 29 18:07:47 2015 -0400
Committer: Dave Marion <dl...@hotmail.com>
Committed: Wed Apr 29 18:07:47 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/server/util/RestoreZookeeper.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/67c8b2b6/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java b/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
index 3dd639e..3c51727 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
@@ -71,6 +71,8 @@ public class RestoreZookeeper {
else
cwd.push(root);
create(root, "", UTF_8.name());
+ } else if ("ephemeral".equals(name)) {
+ cwd.push("");
}
}
[2/2] accumulo git commit: Merge branch '1.6' into 1.7
Posted by dl...@apache.org.
Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ef2e31af
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ef2e31af
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ef2e31af
Branch: refs/heads/1.7
Commit: ef2e31af3d6503e31e79610cd49de9ce0190f6f6
Parents: c55fe3e 67c8b2b
Author: Dave Marion <dl...@hotmail.com>
Authored: Wed Apr 29 18:08:36 2015 -0400
Committer: Dave Marion <dl...@hotmail.com>
Committed: Wed Apr 29 18:08:36 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/server/util/RestoreZookeeper.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ef2e31af/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
----------------------------------------------------------------------