You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bi...@apache.org on 2013/04/03 18:33:04 UTC
svn commit: r1464092 - in /accumulo/branches/1.5: ./ assemble/ core/
core/src/test/java/org/apache/accumulo/core/util/shell/ examples/
fate/src/main/java/org/apache/accumulo/fate/
fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ src/
Author: billie
Date: Wed Apr 3 16:33:03 2013
New Revision: 1464092
URL: http://svn.apache.org/r1464092
Log:
ACCUMULO-1118 merged shelltest fix to 1.5 branch
Modified:
accumulo/branches/1.5/ (props changed)
accumulo/branches/1.5/assemble/ (props changed)
accumulo/branches/1.5/core/ (props changed)
accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
accumulo/branches/1.5/examples/ (props changed)
accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed)
accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed)
accumulo/branches/1.5/server/ (props changed)
accumulo/branches/1.5/src/ (props changed)
Propchange: accumulo/branches/1.5/
------------------------------------------------------------------------------
Merged /accumulo/trunk:r1463798
Propchange: accumulo/branches/1.5/assemble/
------------------------------------------------------------------------------
Merged /accumulo/trunk/assemble:r1463798
Propchange: accumulo/branches/1.5/core/
------------------------------------------------------------------------------
Merged /accumulo/trunk/core:r1463798
Modified: accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java?rev=1464092&r1=1464091&r2=1464092&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java (original)
+++ accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java Wed Apr 3 16:33:03 2013
@@ -83,7 +83,7 @@ public class ShellTest {
output = new TestOutputStream();
shell = new Shell(new ConsoleReader(new FileInputStream(FileDescriptor.in), new OutputStreamWriter(output)));
shell.setLogErrorsToConsole();
- shell.config("--fake", "-p", "pass");
+ shell.config("--fake", "-p", "");
}
void assertGoodExit(String s, boolean stringPresent) {
Propchange: accumulo/branches/1.5/examples/
------------------------------------------------------------------------------
Merged /accumulo/trunk/examples:r1463798
Propchange: accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged /accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1463798
Propchange: accumulo/branches/1.5/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:r1463798
Propchange: accumulo/branches/1.5/server/
------------------------------------------------------------------------------
Merged /accumulo/trunk/server:r1463798
Propchange: accumulo/branches/1.5/src/
------------------------------------------------------------------------------
Merged /accumulo/trunk/src:r1463798