accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhava...@apache.org
Subject [04/14] git commit: ACCUMULO-1961 Fix more recently introduced javadoc problems.
Date Wed, 19 Feb 2014 14:37:53 GMT
ACCUMULO-1961 Fix more recently introduced javadoc problems.


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

Branch: refs/heads/master
Commit: 4abb3f1afd7c0f44cb71671148629cfcbbf5746f
Parents: 732f037
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Tue Feb 18 15:33:36 2014 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Tue Feb 18 15:33:36 2014 -0500

----------------------------------------------------------------------
 .../java/org/apache/accumulo/core/client/Instance.java    | 10 ++++------
 .../accumulo/server/watcher/MonitorLog4jWatcher.java      | 10 ++--------
 2 files changed, 6 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4abb3f1a/core/src/main/java/org/apache/accumulo/core/client/Instance.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/Instance.java b/core/src/main/java/org/apache/accumulo/core/client/Instance.java
index c6f6f33..05cc7f2 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/Instance.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/Instance.java
@@ -121,14 +121,13 @@ public interface Instance {
    */
   @Deprecated
   Connector getConnector(String user, CharSequence pass) throws AccumuloException, AccumuloSecurityException;
-  
+
   /**
    * Returns the AccumuloConfiguration to use when interacting with this instance.
    * 
    * @return the AccumuloConfiguration that specifies properties related to interacting with
this instance
-   * @deprecated since 1.6.0.
-   * This method makes very little sense in the context of the client API and never should
have been exposed.
-   * @see {@link InstanceOperations#getConfiguration()} for client-side reading of the server-side
configuration.
+   * @deprecated since 1.6.0. This method makes very little sense in the context of the client
API and never should have been exposed.
+   * @see {@link InstanceOperations#getSystemConfiguration()} for client-side reading of
the server-side configuration.
    */
   @Deprecated
   AccumuloConfiguration getConfiguration();
@@ -138,8 +137,7 @@ public interface Instance {
    * 
    * @param conf
    *          accumulo configuration
-   * @deprecated since 1.6.0.
-   * This method makes very little sense in the context of the client API and never should
have been exposed.
+   * @deprecated since 1.6.0. This method makes very little sense in the context of the client
API and never should have been exposed.
    * @see {@link InstanceOperations#setProperty(String, String)}
    */
   @Deprecated

http://git-wip-us.apache.org/repos/asf/accumulo/blob/4abb3f1a/server/base/src/main/java/org/apache/accumulo/server/watcher/MonitorLog4jWatcher.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/watcher/MonitorLog4jWatcher.java
b/server/base/src/main/java/org/apache/accumulo/server/watcher/MonitorLog4jWatcher.java
index d0ca27f..ac3426e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/watcher/MonitorLog4jWatcher.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/watcher/MonitorLog4jWatcher.java
@@ -43,12 +43,6 @@ public class MonitorLog4jWatcher extends FileWatchdog implements Watcher
{
   private boolean loggingDisabled = false;
   protected String path;
 
-  /**
-   * @param zkPath
-   * @param filename
-   * @param delay
-   * @param propertyName
-   */
   public MonitorLog4jWatcher(String instance, String filename, int delay) {
     super(filename);
     setDelay(delay);
@@ -78,7 +72,7 @@ public class MonitorLog4jWatcher extends FileWatchdog implements Watcher
{
       resetLogger();
       return;
     }
-    
+
     synchronized (lock) {
       // We might triggered by file-reloading or from ZK update.
       // Either way will result in log-forwarding being restarted
@@ -87,7 +81,7 @@ public class MonitorLog4jWatcher extends FileWatchdog implements Watcher
{
       resetLogger();
     }
   }
-  
+
   private void resetLogger() {
     // Force a reset on the logger's configuration
     LogManager.resetConfiguration();


Mime
View raw message