merge from 2.1.0

CHANGES.txt

@@ -1,6 +1,10 @@
-2.1.0
+2.1.1
  * Improve schema merge performance (CASSANDRA-7444)
  * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454)
+
+
+2.1.0
+ * (Windows) handle spaces in path names (CASSANDRA-7451)
 Merged from 2.0:
  * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394)
  * Support DISTINCT for static columns and fix behaviour when DISTINC is

bin/cassandra.bat

@@ -35,7 +35,7 @@ goto runLegacy
 REM -----------------------------------------------------------------------------
 :runPowerShell
 echo Detected powershell execution permissions.  Running with enhanced startup scripts.
-powershell /file %CASSANDRA_HOME%\bin\cassandra.ps1 %*
+powershell /file "%CASSANDRA_HOME%\bin\cassandra.ps1" %*
 goto finally
 
 REM -----------------------------------------------------------------------------

bin/cassandra.ps1

@@ -79,7 +79,7 @@ Function Main
 
     $logdir = "$env:CASSANDRA_HOME/logs"
     $storagedir = "$env:CASSANDRA_HOME/data"
-    $env:CASSANDRA_PARAMS = $env:CASSANDRA_PARAMS + " -Dcassandra.logdir=$logdir -Dcassandra.storagedir=$storagedir"
+    $env:CASSANDRA_PARAMS = $env:CASSANDRA_PARAMS + " -Dcassandra.logdir=""$logdir"" -Dcassandra.storagedir=""$storagedir"""
 
     # Other command line params
     if ($H)

conf/cassandra-env.ps1

@@ -39,7 +39,7 @@ Function SetCassandraMain()
 #-----------------------------------------------------------------------------
 Function BuildClassPath
 {
-    $cp = "$env:CASSANDRA_HOME\conf"
+    $cp = """$env:CASSANDRA_HOME\conf"""
     foreach ($file in Get-ChildItem "$env:CASSANDRA_HOME\lib\*.jar")
     {
         $file = $file -replace "\\", "/"
@@ -47,7 +47,7 @@ Function BuildClassPath
     }
 
     # Add build/classes/main so it works in development
-    $cp = $cp + ";" + "$env:CASSANDRA_HOME\build\classes\main;$env:CASSANDRA_HOME\build\classes\thrift"
+    $cp = $cp + ";" + """$env:CASSANDRA_HOME\build\classes\main"";""$env:CASSANDRA_HOME\build\classes\thrift"""
     $env:CLASSPATH=$cp
 }