Author: ecn
Date: Thu Jun 6 16:19:06 2013
New Revision: 1490337
URL: http://svn.apache.org/r1490337
Log:
ACCUMULO-118 merge trunk into sandbox
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/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java
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)
Propchange: accumulo/branches/ACCUMULO-118/
------------------------------------------------------------------------------
Merged /accumulo/trunk:r1490273-1490336
Propchange: accumulo/branches/ACCUMULO-118/assemble/
------------------------------------------------------------------------------
Merged /accumulo/trunk/assemble:r1490273-1490336
Propchange: accumulo/branches/ACCUMULO-118/core/
------------------------------------------------------------------------------
Merged /accumulo/trunk/core:r1490273-1490336
Modified:
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java?rev=1490337&r1=1490336&r2=1490337&view=diff
==============================================================================
---
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java
(original)
+++
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java
Thu Jun 6 16:19:06 2013
@@ -17,6 +17,7 @@
package org.apache.accumulo.core.util.shell;
import java.io.File;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -80,7 +81,7 @@ public class ShellOptionsJC {
private boolean hdfsZooInstance;
@Parameter(names = {"-z", "--zooKeeperInstance"}, description = "use a
zookeeper instance with the given instance name and list of zoo hosts", arity =
2)
- private List<String> zooKeeperInstance;
+ private List<String> zooKeeperInstance = new ArrayList<String>();
@Parameter(names = "--auth-timeout", description = "minutes the shell can be
idle without re-entering a password")
private int authTimeout = 60; // TODO Add validator for positive number
Propchange: accumulo/branches/ACCUMULO-118/examples/
------------------------------------------------------------------------------
Merged /accumulo/trunk/examples:r1490273-1490336
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:r1490273-1490336
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:r1490273-1490336
Propchange: accumulo/branches/ACCUMULO-118/pom.xml
------------------------------------------------------------------------------
Merged /accumulo/trunk/pom.xml:r1490273-1490336
Propchange: accumulo/branches/ACCUMULO-118/proxy/README
------------------------------------------------------------------------------
Merged /accumulo/trunk/proxy/README:r1490273-1490336
Propchange: accumulo/branches/ACCUMULO-118/server/
------------------------------------------------------------------------------
Merged /accumulo/trunk/server:r1490273-1490336
Propchange: accumulo/branches/ACCUMULO-118/src/
------------------------------------------------------------------------------
Merged /accumulo/trunk/src:r1490273-1490336
