accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1486203 - in /accumulo/branches/ACCUMULO-118: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ proxy/ server/ src/ start/src/main/java/org/apache/accumulo/start/
Date Fri, 24 May 2013 20:02:22 GMT
Author: ecn
Date: Fri May 24 20:02:22 2013
New Revision: 1486203

URL: http://svn.apache.org/r1486203
Log:
ACCUMULO-118 merge trunk to branch

Modified:
    accumulo/branches/ACCUMULO-118/   (props changed)
    accumulo/branches/ACCUMULO-118/assemble/   (props changed)
    accumulo/branches/ACCUMULO-118/core/   (props changed)
    accumulo/branches/ACCUMULO-118/examples/   (props changed)
    accumulo/branches/ACCUMULO-118/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
  (props changed)
    accumulo/branches/ACCUMULO-118/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
  (props changed)
    accumulo/branches/ACCUMULO-118/pom.xml   (props changed)
    accumulo/branches/ACCUMULO-118/proxy/README   (props changed)
    accumulo/branches/ACCUMULO-118/server/   (props changed)
    accumulo/branches/ACCUMULO-118/src/   (props changed)
    accumulo/branches/ACCUMULO-118/start/src/main/java/org/apache/accumulo/start/Main.java

Propchange: accumulo/branches/ACCUMULO-118/
------------------------------------------------------------------------------
  Merged /accumulo/trunk:r1486136-1486202

Propchange: accumulo/branches/ACCUMULO-118/assemble/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/assemble:r1486136-1486202

Propchange: accumulo/branches/ACCUMULO-118/core/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/core:r1486136-1486202

Propchange: accumulo/branches/ACCUMULO-118/examples/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/examples:r1486136-1486202

Propchange: accumulo/branches/ACCUMULO-118/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
  Merged /accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1486136-1486202

Propchange: accumulo/branches/ACCUMULO-118/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
  Merged /accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1486136-1486202

Propchange: accumulo/branches/ACCUMULO-118/pom.xml
------------------------------------------------------------------------------
  Merged /accumulo/trunk/pom.xml:r1486136-1486202

Propchange: accumulo/branches/ACCUMULO-118/proxy/README
------------------------------------------------------------------------------
  Merged /accumulo/trunk/proxy/README:r1486136-1486202

Propchange: accumulo/branches/ACCUMULO-118/server/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/server:r1486136-1486202

Propchange: accumulo/branches/ACCUMULO-118/src/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src:r1486136-1486202

Modified: accumulo/branches/ACCUMULO-118/start/src/main/java/org/apache/accumulo/start/Main.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/start/src/main/java/org/apache/accumulo/start/Main.java?rev=1486203&r1=1486202&r2=1486203&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/start/src/main/java/org/apache/accumulo/start/Main.java
(original)
+++ accumulo/branches/ACCUMULO-118/start/src/main/java/org/apache/accumulo/start/Main.java
Fri May 24 20:02:22 2013
@@ -121,6 +121,6 @@ public class Main {
   }
   
   private static void printUsage() {
-    System.out.println("accumulo init | master | tserver | monitor | shell | admin | gc |
classpath | rfile-info | login-info | tracer | mini | proxy | zookeeper | create-token | <accumulo
class> args");
+    System.out.println("accumulo init | master | tserver | monitor | shell | admin | gc |
classpath | rfile-info | login-info | tracer | minicluster | proxy | zookeeper | create-token
| <accumulo class> args");
   }
 }



Mime
View raw message