You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2015/06/05 00:28:26 UTC
[1/3] accumulo git commit: ACCUMULO-3887 Fix broken unit test
Repository: accumulo
Updated Branches:
refs/heads/1.7 884165d28 -> b3760d6c2
refs/heads/master 428b5b781 -> 562c2e2ad
ACCUMULO-3887 Fix broken unit test
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b3760d6c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b3760d6c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b3760d6c
Branch: refs/heads/1.7
Commit: b3760d6c2e2ed4f8fd65af8be4c846e9e229b469
Parents: 884165d
Author: Josh Elser <el...@apache.org>
Authored: Thu Jun 4 18:28:05 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jun 4 18:28:05 2015 -0400
----------------------------------------------------------------------
.../src/test/java/org/apache/accumulo/server/util/AdminTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b3760d6c/server/base/src/test/java/org/apache/accumulo/server/util/AdminTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/AdminTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/AdminTest.java
index 9685b28..cb7dc28 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/AdminTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/AdminTest.java
@@ -68,7 +68,7 @@ public class AdminTest {
EasyMock.replay(zc);
- assertEquals(server + "[" + session + "]", Admin.qualifyWithZooKeeperSessionId(root, zc, server));
+ assertEquals(server + "[" + Long.toHexString(session) + "]", Admin.qualifyWithZooKeeperSessionId(root, zc, server));
EasyMock.verify(zc);
}
[3/3] accumulo git commit: Merge branch '1.7'
Posted by el...@apache.org.
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/562c2e2a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/562c2e2a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/562c2e2a
Branch: refs/heads/master
Commit: 562c2e2adac76caf4fde155d9b2a15e8d58b3848
Parents: 428b5b7 b3760d6
Author: Josh Elser <el...@apache.org>
Authored: Thu Jun 4 18:28:15 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jun 4 18:28:15 2015 -0400
----------------------------------------------------------------------
.../src/test/java/org/apache/accumulo/server/util/AdminTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] accumulo git commit: ACCUMULO-3887 Fix broken unit test
Posted by el...@apache.org.
ACCUMULO-3887 Fix broken unit test
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b3760d6c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b3760d6c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b3760d6c
Branch: refs/heads/master
Commit: b3760d6c2e2ed4f8fd65af8be4c846e9e229b469
Parents: 884165d
Author: Josh Elser <el...@apache.org>
Authored: Thu Jun 4 18:28:05 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jun 4 18:28:05 2015 -0400
----------------------------------------------------------------------
.../src/test/java/org/apache/accumulo/server/util/AdminTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b3760d6c/server/base/src/test/java/org/apache/accumulo/server/util/AdminTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/AdminTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/AdminTest.java
index 9685b28..cb7dc28 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/AdminTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/AdminTest.java
@@ -68,7 +68,7 @@ public class AdminTest {
EasyMock.replay(zc);
- assertEquals(server + "[" + session + "]", Admin.qualifyWithZooKeeperSessionId(root, zc, server));
+ assertEquals(server + "[" + Long.toHexString(session) + "]", Admin.qualifyWithZooKeeperSessionId(root, zc, server));
EasyMock.verify(zc);
}