You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2014/04/19 00:15:22 UTC
[1/2] git commit: ACCUMULO-2686 Label classes with correct @since tag
Repository: accumulo
Updated Branches:
refs/heads/master 5abb916fc -> 3086472f4
ACCUMULO-2686 Label classes with correct @since tag
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b383cc57
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b383cc57
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b383cc57
Branch: refs/heads/master
Commit: b383cc571535dc8306f338a22e87051ab861dae3
Parents: 0f3b4ca
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Apr 18 17:29:00 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Apr 18 18:09:13 2014 -0400
----------------------------------------------------------------------
.../apache/accumulo/core/security/crypto/BlockedIOStreamTest.java | 3 +--
.../apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 2 +-
.../apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java | 3 ++-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b383cc57/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java b/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
index 212aaaf..ea64ac7 100644
--- a/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.accumulo.core.security.crypto;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -27,7 +27,6 @@ import java.util.Arrays;
import java.util.Random;
import org.apache.accumulo.core.Constants;
-import org.apache.commons.lang.ArrayUtils;
import org.junit.Test;
public class BlockedIOStreamTest {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b383cc57/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
index fbd7ef3..6d16617 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
@@ -82,7 +82,7 @@ import com.google.common.collect.Maps;
* A utility class that will create Zookeeper and Accumulo processes that write all of their data to a single local directory. This class makes it easy to test
* code against a real Accumulo instance. Its much more accurate for testing than {@link org.apache.accumulo.core.client.mock.MockAccumulo}, but much slower.
*
- * @since 1.5.0
+ * @since 1.6.0
*/
public class MiniAccumuloClusterImpl implements AccumuloCluster {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b383cc57/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
index 8f65786..3258991 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
@@ -30,7 +30,7 @@ import org.apache.accumulo.server.util.PortUtils;
/**
* Holds configuration for {@link MiniAccumuloClusterImpl}. Required configurations must be passed to constructor(s) and all other configurations are optional.
*
- * @since 1.5.0
+ * @since 1.6.0
*/
public class MiniAccumuloConfigImpl implements AccumuloConfig {
@@ -204,6 +204,7 @@ public class MiniAccumuloConfigImpl implements AccumuloConfig {
*
* @since 1.6.0
*/
+ @Override
public MiniAccumuloConfigImpl setZooKeeperPort(int zooKeeperPort) {
this.configuredZookeeperPort = zooKeeperPort;
this.zooKeeperPort = zooKeeperPort;
[2/2] git commit: Merge branch '1.6.0-SNAPSHOT'
Posted by ct...@apache.org.
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3086472f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3086472f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3086472f
Branch: refs/heads/master
Commit: 3086472f4a90ba35e22ee4db3b228f002f68ad1d
Parents: 5abb916 b383cc5
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Apr 18 18:13:46 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Apr 18 18:13:46 2014 -0400
----------------------------------------------------------------------
.../apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 2 +-
.../apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3086472f/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------