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/10/27 22:29:23 UTC

[1/3] git commit: ACCUMULO-2984 Remove unused javadoc tags (no description)

Repository: accumulo
Updated Branches:
  refs/heads/1.6 e4dbe897c -> 6f3a356ba
  refs/heads/master 014d9d955 -> 65cc3d355


ACCUMULO-2984 Remove unused javadoc tags (no description)


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

Branch: refs/heads/1.6
Commit: 6f3a356ba8a951e5800d90b9e8f083a08c2f6c00
Parents: e4dbe89
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Oct 27 17:24:48 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Oct 27 17:26:05 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/server/util/AccumuloStatus.java    | 5 -----
 1 file changed, 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6f3a356b/server/base/src/main/java/org/apache/accumulo/server/util/AccumuloStatus.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/AccumuloStatus.java b/server/base/src/main/java/org/apache/accumulo/server/util/AccumuloStatus.java
index 7e1cc97..6c7fd47 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/AccumuloStatus.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/AccumuloStatus.java
@@ -28,8 +28,6 @@ public class AccumuloStatus {
   /**
    * Determines if there could be an accumulo instance running via zookeeper lock checking
    *
-   * @param reader
-   *
    * @return true iff all servers show no indication of being registered in zookeeper, otherwise false
    * @throws IOException
    *           if there are issues connecting to ZooKeeper to determine service status
@@ -42,9 +40,6 @@ public class AccumuloStatus {
   /**
    * Determines if there could be an accumulo instance running via zookeeper lock checking
    *
-   * @param reader
-   * @param rootPath
-   *
    * @return true iff all servers show no indication of being registered in zookeeper, otherwise false
    * @throws IOException
    *           if there are issues connecting to ZooKeeper to determine service status


[3/3] git commit: Merge branch '1.6'

Posted by ct...@apache.org.
Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 65cc3d3555f53dc6b15966a2c5d90e7ebbe8138b
Parents: 014d9d9 6f3a356
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Oct 27 17:28:22 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Oct 27 17:28:22 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/server/util/AccumuloStatus.java    | 5 -----
 1 file changed, 5 deletions(-)
----------------------------------------------------------------------



[2/3] git commit: ACCUMULO-2984 Remove unused javadoc tags (no description)

Posted by ct...@apache.org.
ACCUMULO-2984 Remove unused javadoc tags (no description)


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

Branch: refs/heads/master
Commit: 6f3a356ba8a951e5800d90b9e8f083a08c2f6c00
Parents: e4dbe89
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Oct 27 17:24:48 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Oct 27 17:26:05 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/server/util/AccumuloStatus.java    | 5 -----
 1 file changed, 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6f3a356b/server/base/src/main/java/org/apache/accumulo/server/util/AccumuloStatus.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/AccumuloStatus.java b/server/base/src/main/java/org/apache/accumulo/server/util/AccumuloStatus.java
index 7e1cc97..6c7fd47 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/AccumuloStatus.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/AccumuloStatus.java
@@ -28,8 +28,6 @@ public class AccumuloStatus {
   /**
    * Determines if there could be an accumulo instance running via zookeeper lock checking
    *
-   * @param reader
-   *
    * @return true iff all servers show no indication of being registered in zookeeper, otherwise false
    * @throws IOException
    *           if there are issues connecting to ZooKeeper to determine service status
@@ -42,9 +40,6 @@ public class AccumuloStatus {
   /**
    * Determines if there could be an accumulo instance running via zookeeper lock checking
    *
-   * @param reader
-   * @param rootPath
-   *
    * @return true iff all servers show no indication of being registered in zookeeper, otherwise false
    * @throws IOException
    *           if there are issues connecting to ZooKeeper to determine service status