You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2015/10/02 22:13:29 UTC
[1/4] accumulo git commit: ACCUMULO-2232 fix since version
Repository: accumulo
Updated Branches:
refs/heads/master 49b44e4eb -> 445f3fe1d
ACCUMULO-2232 fix since version
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f3203854
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f3203854
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f3203854
Branch: refs/heads/master
Commit: f3203854451c41b06210a9a9fc3ce492f9feb58c
Parents: a39b3f6
Author: Keith Turner <kt...@apache.org>
Authored: Fri Oct 2 15:37:38 2015 -0400
Committer: Keith Turner <kt...@apache.org>
Committed: Fri Oct 2 15:37:38 2015 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/accumulo/core/iterators/Combiner.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f3203854/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
index 091803b..5dd4f82 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
@@ -393,7 +393,7 @@ public abstract class Combiner extends WrappingIterator implements OptionDescrib
* This method was added in 1.6.4 and 1.7.1. If you want your code to work in earlier versions of 1.6 and 1.7 then do not call this method. If not set this
* property defaults to false in order to maintain compatibility.
*
- * @since 1.6.4 1.7.1 1.8.0
+ * @since 1.6.5 1.7.1 1.8.0
*/
public static void setReduceOnFullCompactionOnly(IteratorSetting is, boolean reduceOnFullCompactionOnly) {
[4/4] accumulo git commit: ACCUMULO-2232 Fix test
Posted by kt...@apache.org.
ACCUMULO-2232 Fix test
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/445f3fe1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/445f3fe1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/445f3fe1
Branch: refs/heads/master
Commit: 445f3fe1dc0fb61ec3ac67ed9793f755293eb4f4
Parents: 3444ef7
Author: Keith Turner <kt...@apache.org>
Authored: Fri Oct 2 16:11:33 2015 -0400
Committer: Keith Turner <kt...@apache.org>
Committed: Fri Oct 2 16:11:33 2015 -0400
----------------------------------------------------------------------
.../accumulo/server/replication/StatusCombinerTest.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/445f3fe1/server/base/src/test/java/org/apache/accumulo/server/replication/StatusCombinerTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/replication/StatusCombinerTest.java b/server/base/src/test/java/org/apache/accumulo/server/replication/StatusCombinerTest.java
index 26ad8de..7f70a57 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/replication/StatusCombinerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/replication/StatusCombinerTest.java
@@ -24,9 +24,11 @@ import java.util.List;
import org.apache.accumulo.core.client.IteratorSetting;
import org.apache.accumulo.core.client.IteratorSetting.Column;
+import org.apache.accumulo.core.client.impl.BaseIteratorEnvironment;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.iterators.Combiner;
import org.apache.accumulo.core.iterators.DevNull;
+import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
import org.apache.accumulo.core.replication.ReplicationSchema.StatusSection;
import org.apache.accumulo.server.replication.proto.Replication.Status;
import org.junit.Assert;
@@ -39,6 +41,13 @@ public class StatusCombinerTest {
private Key key;
private Status.Builder builder;
+ private static class TestIE extends BaseIteratorEnvironment {
+ @Override
+ public IteratorScope getIteratorScope() {
+ return IteratorScope.scan;
+ }
+ }
+
@Before
public void initCombiner() throws IOException {
key = new Key();
@@ -46,7 +55,7 @@ public class StatusCombinerTest {
builder = Status.newBuilder();
IteratorSetting cfg = new IteratorSetting(50, StatusCombiner.class);
Combiner.setColumns(cfg, Collections.singletonList(new Column(StatusSection.NAME)));
- combiner.init(new DevNull(), cfg.getOptions(), null);
+ combiner.init(new DevNull(), cfg.getOptions(), new TestIE());
}
@Test
[2/4] accumulo git commit: Merge branch '1.6' into 1.7
Posted by kt...@apache.org.
Merge branch '1.6' 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/713282a0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/713282a0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/713282a0
Branch: refs/heads/master
Commit: 713282a0e38f2146466ed631b9ad9fa26aaf2a39
Parents: 4623103 f320385
Author: Keith Turner <kt...@apache.org>
Authored: Fri Oct 2 15:43:38 2015 -0400
Committer: Keith Turner <kt...@apache.org>
Committed: Fri Oct 2 15:43:38 2015 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/accumulo/core/iterators/Combiner.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/713282a0/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
----------------------------------------------------------------------
[3/4] accumulo git commit: Merge branch '1.7'
Posted by kt...@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/3444ef7c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3444ef7c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3444ef7c
Branch: refs/heads/master
Commit: 3444ef7c5f9ef48e3f24eb38300868ab79c7b45e
Parents: 49b44e4 713282a
Author: Keith Turner <kt...@apache.org>
Authored: Fri Oct 2 15:48:40 2015 -0400
Committer: Keith Turner <kt...@apache.org>
Committed: Fri Oct 2 15:48:40 2015 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/accumulo/core/iterators/Combiner.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------