accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1453577 - in /accumulo/trunk: ./ core/ core/src/main/java/org/apache/accumulo/core/util/LoginProperties.java core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java start/src/main/java/org/apache/accumulo/start/Main.java
Date Wed, 06 Mar 2013 21:26:53 GMT
Author: vines
Date: Wed Mar  6 21:26:52 2013
New Revision: 1453577

URL: http://svn.apache.org/r1453577
Log:
ACCUMULO-1157 - bin/accumulo login-info will now dump properties.
Also, undeprecated a private method in the shell



Added:
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/LoginProperties.java
      - copied unchanged from r1453576, accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/LoginProperties.java
Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/core/   (props changed)
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
    accumulo/trunk/start/src/main/java/org/apache/accumulo/start/Main.java

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5:r1453519-1453576

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/core:r1453519-1453576

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1453577&r1=1453576&r2=1453577&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java Wed Mar
 6 21:26:52 2013
@@ -362,10 +362,7 @@ public class Shell extends ShellOptions 
     }
   }
 
-  /**
-   * @deprecated Not for client use
-   */
-  @Deprecated
+  @SuppressWarnings("deprecation")
   private static Instance getDefaultInstance(AccumuloConfiguration conf) {
     String keepers = conf.get(Property.INSTANCE_ZK_HOST);
     Path instanceDir = new Path(conf.get(Property.INSTANCE_DFS_DIR), "instance_id");

Modified: accumulo/trunk/start/src/main/java/org/apache/accumulo/start/Main.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/start/src/main/java/org/apache/accumulo/start/Main.java?rev=1453577&r1=1453576&r2=1453577&view=diff
==============================================================================
--- accumulo/trunk/start/src/main/java/org/apache/accumulo/start/Main.java (original)
+++ accumulo/trunk/start/src/main/java/org/apache/accumulo/start/Main.java Wed Mar  6 21:26:52
2013
@@ -115,6 +115,6 @@ public class Main {
   }
 
   private static void printUsage() {
-    System.out.println("accumulo init | master | tserver | monitor | shell | admin | gc |
classpath | rfile-info | tracer | proxy | <accumulo class> args");
+    System.out.println("accumulo init | master | tserver | monitor | shell | admin | gc |
classpath | rfile-info | login-info | tracer | proxy | <accumulo class> args");
   }
 }



Mime
View raw message