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/02/11 01:09:43 UTC

[1/3] accumulo git commit: ACCUMULO-3576 Use guava's preconditions, not jline's

Repository: accumulo
Updated Branches:
  refs/heads/1.6 ac44627eb -> 712504b2d
  refs/heads/master 729b2c560 -> 93a3d5c69


ACCUMULO-3576 Use guava's preconditions, not jline's


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

Branch: refs/heads/1.6
Commit: 712504b2df712c9265dee3e4493858508148e32f
Parents: ac44627
Author: Josh Elser <el...@apache.org>
Authored: Tue Feb 10 18:54:14 2015 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Tue Feb 10 18:54:14 2015 -0500

----------------------------------------------------------------------
 .../java/org/apache/accumulo/tserver/ActiveAssignmentRunnable.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/712504b2/server/tserver/src/main/java/org/apache/accumulo/tserver/ActiveAssignmentRunnable.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/ActiveAssignmentRunnable.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/ActiveAssignmentRunnable.java
index dcbdae7..c02f7f2 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/ActiveAssignmentRunnable.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/ActiveAssignmentRunnable.java
@@ -18,7 +18,7 @@ package org.apache.accumulo.tserver;
 
 import java.util.concurrent.ConcurrentHashMap;
 
-import jline.internal.Preconditions;
+import com.google.common.base.Preconditions;
 
 import org.apache.accumulo.core.data.KeyExtent;
 import org.slf4j.Logger;


[2/3] accumulo git commit: ACCUMULO-3576 Use guava's preconditions, not jline's

Posted by el...@apache.org.
ACCUMULO-3576 Use guava's preconditions, not jline's


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

Branch: refs/heads/master
Commit: 712504b2df712c9265dee3e4493858508148e32f
Parents: ac44627
Author: Josh Elser <el...@apache.org>
Authored: Tue Feb 10 18:54:14 2015 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Tue Feb 10 18:54:14 2015 -0500

----------------------------------------------------------------------
 .../java/org/apache/accumulo/tserver/ActiveAssignmentRunnable.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/712504b2/server/tserver/src/main/java/org/apache/accumulo/tserver/ActiveAssignmentRunnable.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/ActiveAssignmentRunnable.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/ActiveAssignmentRunnable.java
index dcbdae7..c02f7f2 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/ActiveAssignmentRunnable.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/ActiveAssignmentRunnable.java
@@ -18,7 +18,7 @@ package org.apache.accumulo.tserver;
 
 import java.util.concurrent.ConcurrentHashMap;
 
-import jline.internal.Preconditions;
+import com.google.common.base.Preconditions;
 
 import org.apache.accumulo.core.data.KeyExtent;
 import org.slf4j.Logger;


[3/3] accumulo git commit: Merge branch '1.6'

Posted by el...@apache.org.
Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 93a3d5c69fe13659c3b9536e9fa83d43eefae828
Parents: 729b2c5 712504b
Author: Josh Elser <el...@apache.org>
Authored: Tue Feb 10 18:54:57 2015 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Tue Feb 10 18:54:57 2015 -0500

----------------------------------------------------------------------
 .../java/org/apache/accumulo/tserver/ActiveAssignmentRunnable.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------