You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2015/04/23 16:32:47 UTC
[01/11] accumulo git commit: ACCUMULO-3743 Bump master to
1.8.0-SNAPSHOT
Repository: accumulo
Updated Branches:
refs/heads/1.7 47c64d9a0 -> 02db25eb8
ACCUMULO-3743 Bump master to 1.8.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/321f5733
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/321f5733
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/321f5733
Branch: refs/heads/1.7
Commit: 321f573311dd62f92acdc39a4f3fa65fb77ddd6c
Parents: b29bd92
Author: Josh Elser <el...@apache.org>
Authored: Mon Apr 20 23:23:11 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Mon Apr 20 23:23:11 2015 -0400
----------------------------------------------------------------------
assemble/pom.xml | 2 +-
core/pom.xml | 2 +-
docs/pom.xml | 2 +-
examples/simple/pom.xml | 2 +-
fate/pom.xml | 2 +-
maven-plugin/pom.xml | 2 +-
minicluster/pom.xml | 2 +-
pom.xml | 2 +-
proxy/pom.xml | 2 +-
server/base/pom.xml | 2 +-
server/gc/pom.xml | 2 +-
server/master/pom.xml | 2 +-
server/monitor/pom.xml | 2 +-
server/native/pom.xml | 2 +-
server/tracer/pom.xml | 2 +-
server/tserver/pom.xml | 2 +-
shell/pom.xml | 2 +-
start/pom.xml | 2 +-
test/pom.xml | 2 +-
trace/pom.xml | 2 +-
20 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/321f5733/assemble/pom.xml
----------------------------------------------------------------------
diff --git a/assemble/pom.xml b/assemble/pom.xml
index f15c5f4..62d54d0 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>accumulo</artifactId>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/321f5733/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 4a3500c..16fcd02 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>accumulo-core</artifactId>
<name>Core</name>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/321f5733/docs/pom.xml
----------------------------------------------------------------------
diff --git a/docs/pom.xml b/docs/pom.xml
index 47d98da..ef421ac 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>accumulo-docs</artifactId>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/321f5733/examples/simple/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml
index aa2f118..a758016 100644
--- a/examples/simple/pom.xml
+++ b/examples/simple/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>accumulo-examples-simple</artifactId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/321f5733/fate/pom.xml
----------------------------------------------------------------------
diff --git a/fate/pom.xml b/fate/pom.xml
index 5fd9a7e..b93d788 100644
--- a/fate/pom.xml
+++ b/fate/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>accumulo-fate</artifactId>
<name>Fate</name>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/321f5733/maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index d0b618e..9d79646 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>accumulo-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/321f5733/minicluster/pom.xml
----------------------------------------------------------------------
diff --git a/minicluster/pom.xml b/minicluster/pom.xml
index adec106..ff1ff75 100644
--- a/minicluster/pom.xml
+++ b/minicluster/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>accumulo-minicluster</artifactId>
<name>MiniCluster</name>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/321f5733/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 70ca34b..a50571b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
</parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Accumulo</name>
<description>Apache Accumulo is a sorted, distributed key/value store based on Google's BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It features a few novel improvements on the BigTable design in the form of cell-level access labels and a server-side programming mechanism that can modify key/value pairs at various points in the data management process.</description>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/321f5733/proxy/pom.xml
----------------------------------------------------------------------
diff --git a/proxy/pom.xml b/proxy/pom.xml
index eed79b1..508b3f3 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>accumulo-proxy</artifactId>
<name>Proxy</name>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/321f5733/server/base/pom.xml
----------------------------------------------------------------------
diff --git a/server/base/pom.xml b/server/base/pom.xml
index 94850b9..c391dff 100644
--- a/server/base/pom.xml
+++ b/server/base/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>accumulo-server-base</artifactId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/321f5733/server/gc/pom.xml
----------------------------------------------------------------------
diff --git a/server/gc/pom.xml b/server/gc/pom.xml
index 694ffe9..9b1fa59 100644
--- a/server/gc/pom.xml
+++ b/server/gc/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>accumulo-gc</artifactId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/321f5733/server/master/pom.xml
----------------------------------------------------------------------
diff --git a/server/master/pom.xml b/server/master/pom.xml
index cf92d4a..9172fd2 100644
--- a/server/master/pom.xml
+++ b/server/master/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>accumulo-master</artifactId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/321f5733/server/monitor/pom.xml
----------------------------------------------------------------------
diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml
index 51262c1..2d033a5 100644
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>accumulo-monitor</artifactId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/321f5733/server/native/pom.xml
----------------------------------------------------------------------
diff --git a/server/native/pom.xml b/server/native/pom.xml
index aead6ed..08af773 100644
--- a/server/native/pom.xml
+++ b/server/native/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>accumulo-native</artifactId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/321f5733/server/tracer/pom.xml
----------------------------------------------------------------------
diff --git a/server/tracer/pom.xml b/server/tracer/pom.xml
index c44f498..1e0774c 100644
--- a/server/tracer/pom.xml
+++ b/server/tracer/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>accumulo-tracer</artifactId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/321f5733/server/tserver/pom.xml
----------------------------------------------------------------------
diff --git a/server/tserver/pom.xml b/server/tserver/pom.xml
index a4bc3de..2f9daf8 100644
--- a/server/tserver/pom.xml
+++ b/server/tserver/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>accumulo-tserver</artifactId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/321f5733/shell/pom.xml
----------------------------------------------------------------------
diff --git a/shell/pom.xml b/shell/pom.xml
index 6ac997f..55a0367 100644
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>accumulo-shell</artifactId>
<name>Shell</name>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/321f5733/start/pom.xml
----------------------------------------------------------------------
diff --git a/start/pom.xml b/start/pom.xml
index eb75fe0..d6b874f 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>accumulo-start</artifactId>
<name>Start</name>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/321f5733/test/pom.xml
----------------------------------------------------------------------
diff --git a/test/pom.xml b/test/pom.xml
index 5862688..f943eed 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>accumulo-test</artifactId>
<name>Testing</name>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/321f5733/trace/pom.xml
----------------------------------------------------------------------
diff --git a/trace/pom.xml b/trace/pom.xml
index 7777bb3..1fee1e6 100644
--- a/trace/pom.xml
+++ b/trace/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>accumulo-trace</artifactId>
<name>Trace</name>
[08/11] accumulo git commit: Merge branch '1.7'
Posted by ec...@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/dd01cbfa
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dd01cbfa
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dd01cbfa
Branch: refs/heads/1.7
Commit: dd01cbfaea002cf3c736304fd045948add067aeb
Parents: 58cfee8 47c64d9
Author: Billie Rinaldi <bi...@apache.org>
Authored: Thu Apr 23 06:42:46 2015 -0700
Committer: Billie Rinaldi <bi...@apache.org>
Committed: Thu Apr 23 06:42:46 2015 -0700
----------------------------------------------------------------------
.../accumulo/core/client/ClientConfiguration.java | 8 ++++++--
.../accumulo/core/client/ClientConfigurationTest.java | 13 +++++++++++++
2 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[05/11] accumulo git commit: Merge branch '1.7'
Posted by ec...@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/fd9bb3a7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fd9bb3a7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fd9bb3a7
Branch: refs/heads/1.7
Commit: fd9bb3a794c84c40c875e33c4d96092563c19833
Parents: 33ef1e0 ac08cc4
Author: Keith Turner <kt...@apache.org>
Authored: Wed Apr 22 12:15:49 2015 -0400
Committer: Keith Turner <kt...@apache.org>
Committed: Wed Apr 22 12:15:49 2015 -0400
----------------------------------------------------------------------
.../core/client/MutationsRejectedException.java | 24 ++---
.../core/client/admin/ActiveCompaction.java | 4 +-
.../accumulo/core/client/admin/ActiveScan.java | 4 +-
.../core/client/impl/ActiveCompactionImpl.java | 8 +-
.../core/client/impl/ActiveScanImpl.java | 8 +-
.../client/impl/TabletServerBatchWriter.java | 8 +-
.../client/mapred/AccumuloOutputFormat.java | 4 +-
.../client/mapreduce/AccumuloOutputFormat.java | 4 +-
.../apache/accumulo/core/data/KeyExtent.java | 2 +-
.../org/apache/accumulo/core/data/TabletID.java | 29 ------
.../org/apache/accumulo/core/data/TabletId.java | 31 ++++++
.../accumulo/core/data/impl/TabletIDImpl.java | 100 -------------------
.../accumulo/core/data/impl/TabletIdImpl.java | 100 +++++++++++++++++++
.../simple/client/RandomBatchWriter.java | 4 +-
.../org/apache/accumulo/proxy/ProxyServer.java | 6 +-
.../accumulo/shell/commands/InsertCommand.java | 4 +-
.../org/apache/accumulo/test/TestIngest.java | 4 +-
17 files changed, 173 insertions(+), 171 deletions(-)
----------------------------------------------------------------------
[04/11] accumulo git commit: Merge branch '1.7'
Posted by ec...@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/33ef1e02
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/33ef1e02
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/33ef1e02
Branch: refs/heads/1.7
Commit: 33ef1e027643b3e9cfa82b9b2a4e7c48353d3f7f
Parents: 4e88af7 f76acc6
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue Apr 21 19:31:49 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Tue Apr 21 19:31:49 2015 -0400
----------------------------------------------------------------------
core/pom.xml | 2 +-
minicluster/pom.xml | 2 +-
pom.xml | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/33ef1e02/core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/33ef1e02/minicluster/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/33ef1e02/pom.xml
----------------------------------------------------------------------
[10/11] accumulo git commit: Merge branch '1.7' of
git://git.apache.org/accumulo into 1.7
Posted by ec...@apache.org.
Merge branch '1.7' of git://git.apache.org/accumulo 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/5e71adcb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5e71adcb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5e71adcb
Branch: refs/heads/1.7
Commit: 5e71adcb540fcb91ed39c48e5d22186adb77d6ff
Parents: b731194 47c64d9
Author: Eric Newton <er...@gmail.com>
Authored: Thu Apr 23 10:28:19 2015 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Apr 23 10:28:19 2015 -0400
----------------------------------------------------------------------
.../accumulo/core/client/ClientConfiguration.java | 8 ++++++--
.../accumulo/core/client/ClientConfigurationTest.java | 13 +++++++++++++
2 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[09/11] accumulo git commit: ACCUMULO-3488 recompile
TestCompactionStrat.jar
Posted by ec...@apache.org.
ACCUMULO-3488 recompile TestCompactionStrat.jar
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b7311940
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b7311940
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b7311940
Branch: refs/heads/1.7
Commit: b7311940da2ea91f5a3554044f39d219e4e0c2d7
Parents: 312b876
Author: Eric Newton <er...@gmail.com>
Authored: Thu Apr 23 10:22:51 2015 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Apr 23 10:22:51 2015 -0400
----------------------------------------------------------------------
.../apache/accumulo/proxy/SimpleProxyBase.java | 26 +++++++++++++++----
test/src/test/resources/TestCompactionStrat.jar | Bin 1681 -> 2259 bytes
2 files changed, 21 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b7311940/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java b/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
index d124ce9..8aed78a 100644
--- a/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
+++ b/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
@@ -116,6 +116,11 @@ import com.google.common.net.HostAndPort;
*/
public abstract class SimpleProxyBase extends SharedMiniClusterIT {
+ @Override
+ protected int defaultTimeoutSeconds() {
+ return 10*60;
+ }
+
private static final long ZOOKEEPER_PROPAGATION_TIME = 10 * 1000;
private TServer proxyServer;
private int proxyPort;
@@ -1033,10 +1038,14 @@ public abstract class SimpleProxyBase extends SharedMiniClusterIT {
client.updateAndFlush(creds, TABLE_TEST, mutation("row1", "cf", "cq", "123"));
- try {
- client.updateAndFlush(creds, TABLE_TEST, mutation("row1", "cf", "cq", "x"));
- fail("constraint did not fire");
- } catch (MutationsRejectedException ex) {}
+ while (true) {
+ try {
+ client.updateAndFlush(creds, TABLE_TEST, mutation("row1", "cf", "cq", "x"));
+ UtilWaitThread.sleep(1000);
+ } catch (MutationsRejectedException ex) {
+ break;
+ }
+ }
client.removeConstraint(creds, TABLE_TEST, 2);
@@ -1044,7 +1053,14 @@ public abstract class SimpleProxyBase extends SharedMiniClusterIT {
assertEquals(1, client.listConstraints(creds, TABLE_TEST).size());
- client.updateAndFlush(creds, TABLE_TEST, mutation("row1", "cf", "cq", "x"));
+ while (true) {
+ try {
+ client.updateAndFlush(creds, TABLE_TEST, mutation("row1", "cf", "cq", "x"));
+ break;
+ } catch (MutationsRejectedException ex) {
+ UtilWaitThread.sleep(1000);
+ }
+ }
assertScan(new String[][] {{"row1", "cf", "cq", "x"}}, TABLE_TEST);
// splits, merge
client.addSplits(creds, TABLE_TEST, new HashSet<ByteBuffer>(Arrays.asList(s2bb("a"), s2bb("m"), s2bb("z"))));
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b7311940/test/src/test/resources/TestCompactionStrat.jar
----------------------------------------------------------------------
diff --git a/test/src/test/resources/TestCompactionStrat.jar b/test/src/test/resources/TestCompactionStrat.jar
index 0bc38d4..a28cf7a 100644
Binary files a/test/src/test/resources/TestCompactionStrat.jar and b/test/src/test/resources/TestCompactionStrat.jar differ
[06/11] accumulo git commit: Merge branch '1.7'
Posted by ec...@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/9abf6a31
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9abf6a31
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9abf6a31
Branch: refs/heads/1.7
Commit: 9abf6a31810a5bf5823032e5823879c210b191d2
Parents: fd9bb3a d26fc14
Author: Christopher Tubbs <ct...@apache.org>
Authored: Wed Apr 22 13:23:44 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Wed Apr 22 13:23:44 2015 -0400
----------------------------------------------------------------------
.../core/client/MutationsRejectedException.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[03/11] accumulo git commit: Merge branch '1.7'
Posted by ec...@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/4e88af79
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4e88af79
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4e88af79
Branch: refs/heads/1.7
Commit: 4e88af793cd8e0bffdd2c1738d7e38fad57ec407
Parents: 7d2eb67 d1e6e79
Author: Keith Turner <kt...@apache.org>
Authored: Tue Apr 21 18:12:08 2015 -0400
Committer: Keith Turner <kt...@apache.org>
Committed: Tue Apr 21 18:12:08 2015 -0400
----------------------------------------------------------------------
README.md | 30 +-
core/pom.xml | 57 ++
core/src/main/findbugs/exclude-filter.xml | 1 +
.../core/client/ClientConfiguration.java | 8 +
.../core/client/ClientSideIteratorScanner.java | 27 +-
.../accumulo/core/client/IsolatedScanner.java | 4 +-
.../core/client/MutationsRejectedException.java | 68 +-
.../accumulo/core/client/ZooKeeperInstance.java | 21 +-
.../core/client/admin/ActiveCompaction.java | 12 +-
.../accumulo/core/client/admin/ActiveScan.java | 12 +-
.../client/admin/DelegationTokenConfig.java | 4 +-
.../core/client/admin/SecurityOperations.java | 3 +-
.../core/client/impl/ActiveCompactionImpl.java | 19 +-
.../core/client/impl/ActiveScanImpl.java | 14 +-
.../impl/AuthenticationTokenIdentifier.java | 210 +++++
.../core/client/impl/ClientContext.java | 1 -
.../core/client/impl/ConditionalWriterImpl.java | 2 +-
.../accumulo/core/client/impl/Credentials.java | 157 ++++
.../core/client/impl/DelegationTokenImpl.java | 144 ++++
.../client/impl/InstanceOperationsImpl.java | 18 +
.../client/impl/NamespaceOperationsImpl.java | 1 -
.../core/client/impl/OfflineScanner.java | 3 +-
.../core/client/impl/RootTabletLocator.java | 2 +-
.../client/impl/SecurityOperationsImpl.java | 4 +-
.../core/client/impl/TableOperationsImpl.java | 2 +-
.../core/client/impl/TabletLocator.java | 2 +-
.../core/client/impl/TabletLocatorImpl.java | 2 +-
.../impl/TabletServerBatchReaderIterator.java | 2 +-
.../client/impl/TabletServerBatchWriter.java | 8 +-
.../accumulo/core/client/impl/TabletType.java | 2 +-
.../core/client/impl/ThriftScanner.java | 2 +-
.../core/client/impl/TimeoutTabletLocator.java | 2 +-
.../accumulo/core/client/impl/Translator.java | 2 +-
.../accumulo/core/client/impl/Writer.java | 2 +-
.../core/client/mapred/AbstractInputFormat.java | 78 +-
.../client/mapred/AccumuloFileOutputFormat.java | 5 +-
.../client/mapred/AccumuloOutputFormat.java | 23 +-
.../client/mapreduce/AbstractInputFormat.java | 82 +-
.../mapreduce/AccumuloFileOutputFormat.java | 5 +-
.../client/mapreduce/AccumuloOutputFormat.java | 21 +-
.../core/client/mapreduce/RangeInputSplit.java | 24 +-
.../mapreduce/impl/AccumuloInputSplit.java | 73 +-
.../client/mapreduce/impl/BatchInputSplit.java | 21 +-
.../core/client/mapreduce/impl/SplitUtils.java | 59 ++
.../mapreduce/lib/impl/ConfiguratorBase.java | 16 +-
.../mapreduce/lib/impl/InputConfigurator.java | 8 +-
.../core/client/mock/MockConnector.java | 2 +-
.../accumulo/core/client/mock/MockInstance.java | 2 +-
.../client/mock/impl/MockTabletLocator.java | 2 +-
.../client/security/tokens/DelegationToken.java | 134 +---
.../accumulo/core/constraints/Constraint.java | 2 +-
.../core/constraints/VisibilityConstraint.java | 93 +++
.../accumulo/core/data/ComparableBytes.java | 5 +
.../apache/accumulo/core/data/KeyExtent.java | 717 +++--------------
.../org/apache/accumulo/core/data/TabletID.java | 29 +
.../core/data/impl/ComparableBytes.java | 53 ++
.../accumulo/core/data/impl/KeyExtent.java | 768 +++++++++++++++++++
.../accumulo/core/data/impl/TabletIDImpl.java | 100 +++
.../accumulo/core/iterators/IteratorUtil.java | 40 +-
.../core/iterators/system/MultiIterator.java | 2 +-
.../core/metadata/MetadataLocationObtainer.java | 2 +-
.../core/metadata/MetadataServicer.java | 2 +-
.../accumulo/core/metadata/RootTable.java | 2 +-
.../core/metadata/ServicerForRootTable.java | 2 +-
.../core/metadata/TableMetadataServicer.java | 2 +-
.../ReplicationConfigurationUtil.java | 2 +-
.../rpc/SaslClientDigestCallbackHandler.java | 4 +-
.../accumulo/core/rpc/SaslConnectionParams.java | 6 +-
.../security/AuthenticationTokenIdentifier.java | 210 -----
.../accumulo/core/security/Credentials.java | 157 ----
.../core/security/VisibilityConstraint.java | 76 +-
.../core/security/VisibilityEvaluator.java | 10 +-
.../core/tabletserver/log/LogEntry.java | 2 +-
.../org/apache/accumulo/core/util/Merge.java | 2 +-
.../core/client/impl/ScannerImplTest.java | 1 -
.../client/impl/TableOperationsImplTest.java | 3 +-
.../core/client/impl/TabletLocatorImplTest.java | 3 +-
.../impl/TabletServerBatchReaderTest.java | 1 -
.../mapred/AccumuloFileOutputFormatTest.java | 5 +-
.../core/client/mapred/TokenFileTest.java | 2 +-
.../mapreduce/AccumuloFileOutputFormatTest.java | 5 +-
.../core/client/mapreduce/TokenFileTest.java | 2 +-
.../tokens/DelegationTokenImplTest.java | 73 ++
.../security/tokens/DelegationTokenTest.java | 72 --
.../accumulo/core/data/KeyExtentTest.java | 1 +
.../apache/accumulo/core/data/RangeTest.java | 1 +
.../accumulo/core/file/rfile/RFileTest.java | 2 +-
.../core/iterators/IteratorUtilTest.java | 2 +-
.../iterators/system/MultiIteratorTest.java | 2 +-
.../core/metadata/MetadataServicerTest.java | 2 +-
.../ReplicationConfigurationUtilTest.java | 2 +-
.../core/rpc/SaslConnectionParamsTest.java | 12 +-
.../AuthenticationTokenIdentifierTest.java | 1 +
.../accumulo/core/security/CredentialsTest.java | 1 +
.../core/security/VisibilityConstraintTest.java | 1 +
.../apache/accumulo/core/util/MergeTest.java | 2 +-
.../simple/client/RandomBatchWriter.java | 6 +-
minicluster/pom.xml | 29 +
.../impl/MiniAccumuloClusterImpl.java | 2 +-
pom.xml | 5 +
.../org/apache/accumulo/proxy/ProxyServer.java | 8 +-
.../accumulo/server/AccumuloServerContext.java | 2 +-
.../accumulo/server/client/BulkImporter.java | 2 +-
.../server/client/ClientServiceHandler.java | 2 +-
.../accumulo/server/client/HdfsZooInstance.java | 6 +-
.../server/conf/ServerConfiguration.java | 2 +-
.../server/conf/ServerConfigurationFactory.java | 2 +-
.../server/constraints/MetadataConstraints.java | 2 +-
.../accumulo/server/fs/VolumeManagerImpl.java | 2 +-
.../apache/accumulo/server/fs/VolumeUtil.java | 2 +-
.../apache/accumulo/server/init/Initialize.java | 2 +-
.../accumulo/server/master/LiveTServerSet.java | 2 +-
.../master/balancer/ChaoticLoadBalancer.java | 2 +-
.../master/balancer/DefaultLoadBalancer.java | 2 +-
.../server/master/balancer/GroupBalancer.java | 2 +-
.../master/balancer/RegexGroupBalancer.java | 2 +-
.../master/balancer/TableLoadBalancer.java | 2 +-
.../server/master/balancer/TabletBalancer.java | 2 +-
.../server/master/state/Assignment.java | 2 +-
.../server/master/state/CurrentState.java | 2 +-
.../accumulo/server/master/state/MergeInfo.java | 2 +-
.../master/state/MetaDataTableScanner.java | 2 +-
.../master/state/TabletLocationState.java | 2 +-
.../server/master/state/TabletMigration.java | 2 +-
.../master/state/TabletStateChangeIterator.java | 2 +-
.../rpc/SaslServerDigestCallbackHandler.java | 2 +-
.../TCredentialsUpdatingInvocationHandler.java | 4 +-
.../security/AuditedSecurityOperation.java | 4 +-
.../server/security/SecurityOperation.java | 2 +-
.../server/security/SystemCredentials.java | 2 +-
.../AuthenticationTokenSecretManager.java | 6 +-
.../security/handler/KerberosAuthenticator.java | 4 +-
.../tabletserver/LargestFirstMemoryManager.java | 2 +-
.../tabletserver/MemoryManagementActions.java | 2 +-
.../server/tabletserver/MemoryManager.java | 2 +-
.../server/tabletserver/TabletState.java | 2 +-
.../org/apache/accumulo/server/util/Admin.java | 2 +-
.../server/util/CheckForMetadataProblems.java | 2 +-
.../apache/accumulo/server/util/FileUtil.java | 2 +-
.../server/util/FindOfflineTablets.java | 2 +-
.../server/util/MasterMetadataUtil.java | 2 +-
.../accumulo/server/util/MetadataTableUtil.java | 4 +-
.../util/RemoveEntriesForMissingFiles.java | 4 +-
.../server/util/ReplicationTableUtil.java | 4 +-
.../accumulo/server/util/TableDiskUsage.java | 2 +-
.../accumulo/server/util/TabletIterator.java | 2 +-
.../server/util/VerifyTabletAssignments.java | 4 +-
.../server/AccumuloServerContextTest.java | 2 +-
.../server/client/BulkImporterTest.java | 4 +-
.../balancer/ChaoticLoadBalancerTest.java | 2 +-
.../balancer/DefaultLoadBalancerTest.java | 2 +-
.../master/balancer/GroupBalancerTest.java | 2 +-
.../master/balancer/TableLoadBalancerTest.java | 2 +-
.../server/master/state/MergeInfoTest.java | 2 +-
.../master/state/TabletLocationStateTest.java | 2 +-
.../rpc/SaslDigestCallbackHandlerTest.java | 2 +-
.../server/security/SystemCredentialsTest.java | 2 +-
.../AuthenticationTokenSecretManagerTest.java | 2 +-
.../apache/accumulo/server/util/CloneTest.java | 2 +-
.../server/util/ReplicationTableUtilTest.java | 4 +-
.../server/util/TabletIteratorTest.java | 2 +-
.../accumulo/gc/GarbageCollectionAlgorithm.java | 2 +-
.../accumulo/gc/GarbageCollectionTest.java | 2 +-
.../accumulo/gc/SimpleGarbageCollectorTest.java | 2 +-
.../CloseWriteAheadLogReferencesTest.java | 2 +-
.../java/org/apache/accumulo/master/Master.java | 2 +-
.../master/MasterClientServiceHandler.java | 4 +-
.../accumulo/master/TabletGroupWatcher.java | 2 +-
.../master/recovery/RecoveryManager.java | 2 +-
.../accumulo/master/state/MergeStats.java | 2 +-
.../accumulo/master/tableOps/BulkImport.java | 2 +-
.../accumulo/master/tableOps/CompactRange.java | 2 +-
.../accumulo/master/tableOps/CreateTable.java | 2 +-
.../accumulo/master/tableOps/DeleteTable.java | 2 +-
.../accumulo/master/tableOps/ExportTable.java | 2 +-
.../accumulo/master/tableOps/ImportTable.java | 2 +-
.../accumulo/master/tableOps/TableRangeOp.java | 2 +-
.../master/ReplicationOperationsImplTest.java | 4 +-
.../apache/accumulo/master/TestMergeState.java | 2 +-
.../replication/SequentialWorkAssignerTest.java | 2 +-
.../master/replication/StatusMakerTest.java | 2 +-
.../replication/UnorderedWorkAssignerTest.java | 2 +-
.../master/state/RootTabletStateStoreTest.java | 2 +-
.../monitor/servlets/TServersServlet.java | 2 +-
.../monitor/servlets/TablesServlet.java | 2 +-
.../tserver/ActiveAssignmentRunnable.java | 2 +-
.../tserver/ConditionalMutationSet.java | 2 +-
.../apache/accumulo/tserver/FileManager.java | 2 +-
.../org/apache/accumulo/tserver/RowLocks.java | 2 +-
.../apache/accumulo/tserver/TabletServer.java | 2 +-
.../tserver/TabletServerResourceManager.java | 2 +-
.../accumulo/tserver/TservConstraintEnv.java | 2 +-
.../apache/accumulo/tserver/WriteTracker.java | 2 +-
.../compaction/MajorCompactionRequest.java | 2 +-
.../tserver/constraints/ConstraintChecker.java | 2 +-
.../apache/accumulo/tserver/log/DfsLogger.java | 2 +-
.../accumulo/tserver/log/SortedLogRecovery.java | 2 +-
.../tserver/log/TabletServerLogger.java | 2 +-
.../accumulo/tserver/logger/LogFileKey.java | 2 +-
.../accumulo/tserver/logger/LogReader.java | 2 +-
.../mastermessage/SplitReportMessage.java | 2 +-
.../mastermessage/TabletStatusMessage.java | 2 +-
.../replication/AccumuloReplicaSystem.java | 2 +-
.../accumulo/tserver/scan/LookupTask.java | 2 +-
.../tserver/session/MultiScanSession.java | 2 +-
.../accumulo/tserver/session/ScanSession.java | 2 +-
.../accumulo/tserver/session/UpdateSession.java | 2 +-
.../accumulo/tserver/tablet/CommitSession.java | 2 +-
.../accumulo/tserver/tablet/CompactionInfo.java | 2 +-
.../accumulo/tserver/tablet/Compactor.java | 2 +-
.../tserver/tablet/DatafileManager.java | 2 +-
.../apache/accumulo/tserver/tablet/Tablet.java | 2 +-
.../tserver/tablet/TabletCommitter.java | 2 +-
.../LargestFirstMemoryManagerTest.java | 2 +-
.../accumulo/tserver/AssignmentWatcherTest.java | 2 +-
.../tserver/CheckTabletMetadataTest.java | 2 +-
.../tserver/TabletResourceManagerTest.java | 2 +-
.../DefaultCompactionStrategyTest.java | 2 +-
.../SizeLimitCompactionStrategyTest.java | 2 +-
.../ConfigurableCompactionStrategyTest.java | 2 +-
.../constraints/ConstraintCheckerTest.java | 2 +-
.../tserver/log/SortedLogRecoveryTest.java | 2 +-
.../accumulo/tserver/logger/LogFileTest.java | 2 +-
.../replication/AccumuloReplicaSystemTest.java | 2 +-
.../replication/ReplicationProcessorTest.java | 2 +-
.../accumulo/tserver/tablet/TabletTest.java | 2 +-
.../commands/ActiveCompactionIterator.java | 2 +-
.../shell/commands/ActiveScanIterator.java | 2 +-
.../shell/commands/CreateTableCommand.java | 2 +-
.../shell/commands/GetSplitsCommand.java | 2 +-
.../accumulo/shell/commands/InsertCommand.java | 6 +-
.../accumulo/test/QueryMetadataTable.java | 2 +-
.../org/apache/accumulo/test/TestIngest.java | 6 +-
.../apache/accumulo/test/WrongTabletTest.java | 4 +-
.../continuous/ContinuousStatsCollector.java | 4 +-
.../metadata/MetadataBatchScanTest.java | 2 +-
.../performance/scan/CollectTabletStats.java | 4 +-
.../test/performance/thrift/NullTserver.java | 2 +-
.../randomwalk/security/AlterTablePerm.java | 2 +-
.../test/randomwalk/security/Authenticate.java | 2 +-
.../test/randomwalk/security/ChangePass.java | 2 +-
.../test/randomwalk/security/DropTable.java | 2 +-
.../test/randomwalk/security/SetAuths.java | 2 +-
.../randomwalk/security/WalkingSecurity.java | 2 +-
.../randomwalk/sequential/MapRedVerifyTool.java | 4 +-
.../server/security/SystemCredentialsIT.java | 2 +-
.../test/MasterRepairsDualAssignmentIT.java | 4 +-
.../accumulo/test/MetaConstraintRetryIT.java | 4 +-
.../accumulo/test/MultiTableBatchWriterIT.java | 2 +-
.../org/apache/accumulo/test/NamespacesIT.java | 6 +-
.../apache/accumulo/test/SplitRecoveryIT.java | 2 +-
.../accumulo/test/TransportCachingIT.java | 2 +-
.../java/org/apache/accumulo/test/VolumeIT.java | 2 +-
.../test/functional/AccumuloInputFormatIT.java | 2 +-
.../functional/BalanceAfterCommsFailureIT.java | 2 +-
.../BalanceInPresenceOfOfflineTableIT.java | 2 +-
.../test/functional/DynamicThreadPoolsIT.java | 2 +-
.../accumulo/test/functional/KerberosIT.java | 37 +-
.../test/functional/MasterAssignmentIT.java | 4 +-
.../test/functional/MetadataMaxFilesIT.java | 2 +-
.../accumulo/test/functional/PermissionsIT.java | 2 +-
.../functional/SimpleBalancerFairnessIT.java | 2 +-
.../accumulo/test/functional/SplitIT.java | 2 +-
.../test/functional/SplitRecoveryIT.java | 2 +-
.../accumulo/test/functional/TableIT.java | 2 +-
.../functional/TabletStateChangeIteratorIT.java | 2 +-
...bageCollectorCommunicatesWithTServersIT.java | 2 +-
...UnusedWalDoesntCloseReplicationStatusIT.java | 2 +-
268 files changed, 2583 insertions(+), 1779 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4e88af79/core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4e88af79/minicluster/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4e88af79/pom.xml
----------------------------------------------------------------------
[02/11] accumulo git commit: Merge branch '1.7'
Posted by ec...@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/7d2eb671
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7d2eb671
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7d2eb671
Branch: refs/heads/1.7
Commit: 7d2eb6711632c3766fe42d64c160b8687e08ca45
Parents: 321f573 61b76b5
Author: Billie Rinaldi <bi...@apache.org>
Authored: Tue Apr 21 12:42:06 2015 -0700
Committer: Billie Rinaldi <bi...@apache.org>
Committed: Tue Apr 21 12:42:06 2015 -0700
----------------------------------------------------------------------
.../apache/accumulo/core/cli/ClientOpts.java | 5 +-
.../core/client/ClientConfiguration.java | 42 +++++++++++++++-
.../core/client/ClientConfigurationTest.java | 51 ++++++++++++++++++--
.../src/test/resources/multi-valued.client.conf | 17 +++++++
.../minicluster/MiniAccumuloInstance.java | 5 +-
.../org/apache/accumulo/proxy/ProxyServer.java | 3 +-
.../apache/accumulo/shell/ShellOptionsJC.java | 4 +-
.../StandaloneAccumuloClusterConfiguration.java | 3 +-
.../org/apache/accumulo/test/ShellServerIT.java | 3 +-
.../test/functional/ConfigurableMacIT.java | 3 +-
10 files changed, 116 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
[11/11] accumulo git commit: Merge branch 'master' of
git://git.apache.org/accumulo into 1.7
Posted by ec...@apache.org.
Merge branch 'master' of git://git.apache.org/accumulo 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/02db25eb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/02db25eb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/02db25eb
Branch: refs/heads/1.7
Commit: 02db25eb8d328a5b71bd7679bfdbfe24972de0d7
Parents: 5e71adc dd01cbf
Author: Eric Newton <er...@gmail.com>
Authored: Thu Apr 23 10:28:30 2015 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Apr 23 10:28:30 2015 -0400
----------------------------------------------------------------------
assemble/pom.xml | 2 +-
core/pom.xml | 2 +-
docs/pom.xml | 2 +-
examples/simple/pom.xml | 2 +-
fate/pom.xml | 2 +-
maven-plugin/pom.xml | 2 +-
minicluster/pom.xml | 2 +-
pom.xml | 2 +-
proxy/pom.xml | 2 +-
server/base/pom.xml | 2 +-
server/gc/pom.xml | 2 +-
server/master/pom.xml | 2 +-
server/monitor/pom.xml | 2 +-
server/native/pom.xml | 2 +-
server/tracer/pom.xml | 2 +-
server/tserver/pom.xml | 2 +-
shell/pom.xml | 2 +-
start/pom.xml | 2 +-
test/pom.xml | 2 +-
trace/pom.xml | 2 +-
20 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
[07/11] accumulo git commit: Merge branch '1.7'
Posted by ec...@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/58cfee84
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/58cfee84
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/58cfee84
Branch: refs/heads/1.7
Commit: 58cfee84d1d052e0f48afc840996b24eb5f89516
Parents: 9abf6a3 312b876
Author: Keith Turner <kt...@apache.org>
Authored: Wed Apr 22 18:25:02 2015 -0400
Committer: Keith Turner <kt...@apache.org>
Committed: Wed Apr 22 18:25:02 2015 -0400
----------------------------------------------------------------------
.../system/SourceSwitchingIterator.java | 29 +++++++++++++-------
1 file changed, 19 insertions(+), 10 deletions(-)
----------------------------------------------------------------------