Merge branch 'cassandra-2.1' into trunk

2014-10-07 12:22:14 -04:00 · 2014-10-07 12:22:14 -04:00 · 54e4247812
parent 17a4fbdaac 67d476d7c3
commit 54e4247812
1 changed files with 2 additions and 0 deletions
--- a/tools/stress/src/org/apache/cassandra/stress/Stress.java
+++ b/tools/stress/src/org/apache/cassandra/stress/Stress.java
@ -108,6 +108,8 @@ public final class Stress
            StressAction stressAction = new StressAction(settings, logout);
            stressAction.run();
        }
+
+        System.exit(0);
    }

    /**