merge from 0.6

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@921126 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -20,6 +20,9 @@ dev
  * Fix hardcoded row count in Hadoop RecordReader (CASSANDRA-837)
  * Add a jmx status to the streaming service and change several DEBUG
    messages to INFO (CASSANDRA-845)
+ * fix classpath in cassandra-cli.bat for Windows (CASSANDRA-858)
+ * allow re-specifying host, port to cassandra-cli if invalid ones
+   are first tried (CASSANDRA-867)
 
 
 0.6.0-beta1/beta2

bin/cassandra-cli.bat

@@ -26,6 +26,8 @@ set CLASSPATH=
 
 REM For each jar in the CASSANDRA_HOME lib directory call append to build the CLASSPATH variable.
 for %%i in (%CASSANDRA_HOME%\lib\*.jar) do call :append %%~fi
+REM In developer mode, we need to include the ivy downloaded jars.
+for %%i in (%CASSANDRA_HOME%\build\lib\jars\*.jar) do call :append %%~fi
 goto okClasspath
 
 :append

src/java/org/apache/cassandra/cli/CliMain.java

@@ -235,9 +235,11 @@ public class CliMain
         {
             connect(css_.hostName, css_.thriftPort);
         }
-        else 
+        
+        if ( cliClient_ == null )
         {
-            // If not, client must connect explicitly using the "connect" CLI statement.
+            // Connection parameter was either invalid or not present.
+            // User must connect explicitly using the "connect" CLI statement.
             cliClient_ = new CliClient(css_, null);
         }