accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject [accumulo] 01/01: Merge branch '1.9'
Date Thu, 26 Apr 2018 21:41:49 GMT
This is an automated email from the ASF dual-hosted git repository.

kturner pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 89ef9ddbd00f6161aa8d31bca6ff9f65e014e9b8
Merge: 563519a 7e4915a
Author: Keith Turner <kturner@apache.org>
AuthorDate: Thu Apr 26 17:41:29 2018 -0400

    Merge branch '1.9'

 .../src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
index 3e30743,18d8daf..5c3507a
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
@@@ -38,7 -39,7 +38,6 @@@ import java.util.PriorityQueue
  import java.util.Set;
  import java.util.SortedMap;
  import java.util.TreeMap;
- import java.util.concurrent.ConcurrentSkipListSet;
 -import java.util.concurrent.Callable;
  import java.util.concurrent.CopyOnWriteArrayList;
  import java.util.concurrent.TimeUnit;
  import java.util.concurrent.atomic.AtomicBoolean;

-- 
To stop receiving notification emails like this one, please contact
kturner@apache.org.

Mime
View raw message