Merge branch 'cassandra-2.1' into trunk

2015-02-11 16:39:14 +00:00 · 2015-02-11 16:39:14 +00:00 · 62ee1473be
parent 827ad24389 f57ec8c464
commit 62ee1473be
1 changed files with 2 additions and 2 deletions
--- a/tools/stress/src/org/apache/cassandra/stress/settings/StressSettings.java
+++ b/tools/stress/src/org/apache/cassandra/stress/settings/StressSettings.java
@ -239,8 +239,8 @@ public class StressSettings implements Serializable
            first = false;
        }
        return sb.toString()
-                 .replaceAll("\s+([,=()])", "$1")
-                 .replaceAll("([,=(])\s+", "$1")
+                 .replaceAll("\\s+([,=()])", "$1")
+                 .replaceAll("([,=(])\\s+", "$1")
                 .split(" +");
    }