You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2015/06/04 14:09:19 UTC

[1/2] hbase git commit: HBASE-13837 [0.98] TestBoundedByteBufferPool does not compile with JDK 1.6

Repository: hbase
Updated Branches:
  refs/heads/0.98 d68ca0498 -> a86675c2f


HBASE-13837 [0.98] TestBoundedByteBufferPool does not compile with JDK 1.6


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/98a2fe7e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/98a2fe7e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/98a2fe7e

Branch: refs/heads/0.98
Commit: 98a2fe7e5acf1864923e54a1ba40720e859f12bd
Parents: d68ca04
Author: Andrew Purtell <ap...@apache.org>
Authored: Thu Jun 4 12:01:49 2015 +0000
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Jun 4 12:02:01 2015 +0000

----------------------------------------------------------------------
 .../org/apache/hadoop/hbase/io/TestBoundedByteBufferPool.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/98a2fe7e/hbase-common/src/test/java/org/apache/hadoop/hbase/io/TestBoundedByteBufferPool.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/TestBoundedByteBufferPool.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/TestBoundedByteBufferPool.java
index 5074b4c..126b06f 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/TestBoundedByteBufferPool.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/TestBoundedByteBufferPool.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.hbase.io;
 import static org.junit.Assert.assertEquals;
 
 import java.nio.ByteBuffer;
-import java.util.concurrent.ConcurrentLinkedDeque;
+import java.util.concurrent.ConcurrentLinkedQueue;
 
 import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.junit.After;
@@ -88,7 +88,7 @@ public class TestBoundedByteBufferPool {
 
   @Test
   public void testBufferSizeGrowWithMultiThread() throws Exception {
-    final ConcurrentLinkedDeque<ByteBuffer> bufferQueue = new ConcurrentLinkedDeque<ByteBuffer>();
+    final ConcurrentLinkedQueue<ByteBuffer> bufferQueue = new ConcurrentLinkedQueue<ByteBuffer>();
     int takeBufferThreadsCount = 30;
     int putBufferThreadsCount = 1;
     Thread takeBufferThreads[] = new Thread[takeBufferThreadsCount];


[2/2] hbase git commit: Update CHANGES.txt for 0.98.13RC1 again

Posted by ap...@apache.org.
Update CHANGES.txt for 0.98.13RC1 again


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

Branch: refs/heads/0.98
Commit: a86675c2f2f9ee7dbe07c98a4c83276c3b85de76
Parents: 98a2fe7
Author: Andrew Purtell <ap...@apache.org>
Authored: Thu Jun 4 12:03:30 2015 +0000
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Jun 4 12:03:30 2015 +0000

----------------------------------------------------------------------
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/a86675c2/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7508b29..456e6e3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -74,6 +74,7 @@ Release 0.98.13 - 6/13/2015
     * [HBASE-13807] - [0.98] NoTagsKeyValue optimization is not proper
     * [HBASE-13812] - Deleting of last Column Family of a table should not be allowed
     * [HBASE-13826] - Unable to create table when group acls are appropriately set.
+    * [HBASE-13837] - [0.98] TestBoundedByteBufferPool does not compile with JDK 1.6
 
 ** Improvement
     * [HBASE-12415] - Add add(byte[][] arrays) to Bytes.