You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/04/02 20:43:02 UTC

[1/3] git commit: ACCUMULO-2592 Fix incorrect javadoc

Repository: accumulo
Updated Branches:
  refs/heads/1.6.0-SNAPSHOT 09388f567 -> e2552a89f
  refs/heads/master b6344e838 -> 1d58ee19c


ACCUMULO-2592 Fix incorrect javadoc


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: e2552a89f4436292817e1bf94aa0cfa4f7e88339
Parents: 09388f5
Author: Josh Elser <el...@apache.org>
Authored: Wed Apr 2 14:42:39 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Wed Apr 2 14:42:39 2014 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/accumulo/cluster/AccumuloConfig.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e2552a89/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloConfig.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloConfig.java b/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloConfig.java
index 471bd05..8138615 100644
--- a/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloConfig.java
+++ b/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloConfig.java
@@ -132,9 +132,9 @@ public interface AccumuloConfig {
   public AccumuloConfig setNativeLibPaths(String... nativePathItems);
 
   /**
-   * Build the appropriate {@link NewMiniAccumuloCluster} from this configuration
+   * Build the appropriate {@link AccumuloCluster} from this configuration
    *
-   * @return A {@link NewMiniAccumuloCluster}
+   * @return An {@link AccumuloCluster}
    */
   public AccumuloCluster build() throws IOException;
 }


[2/3] git commit: ACCUMULO-2592 Fix incorrect javadoc

Posted by el...@apache.org.
ACCUMULO-2592 Fix incorrect javadoc


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

Branch: refs/heads/master
Commit: e2552a89f4436292817e1bf94aa0cfa4f7e88339
Parents: 09388f5
Author: Josh Elser <el...@apache.org>
Authored: Wed Apr 2 14:42:39 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Wed Apr 2 14:42:39 2014 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/accumulo/cluster/AccumuloConfig.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e2552a89/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloConfig.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloConfig.java b/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloConfig.java
index 471bd05..8138615 100644
--- a/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloConfig.java
+++ b/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloConfig.java
@@ -132,9 +132,9 @@ public interface AccumuloConfig {
   public AccumuloConfig setNativeLibPaths(String... nativePathItems);
 
   /**
-   * Build the appropriate {@link NewMiniAccumuloCluster} from this configuration
+   * Build the appropriate {@link AccumuloCluster} from this configuration
    *
-   * @return A {@link NewMiniAccumuloCluster}
+   * @return An {@link AccumuloCluster}
    */
   public AccumuloCluster build() throws IOException;
 }


[3/3] git commit: Merge branch '1.6.0-SNAPSHOT'

Posted by el...@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/1d58ee19
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1d58ee19
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1d58ee19

Branch: refs/heads/master
Commit: 1d58ee19c67f7df4d992ab8bd5b15162cad18e75
Parents: b6344e8 e2552a8
Author: Josh Elser <el...@apache.org>
Authored: Wed Apr 2 14:42:51 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Wed Apr 2 14:42:51 2014 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/accumulo/cluster/AccumuloConfig.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------