Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/24e9d631 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/24e9d631 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/24e9d631 Branch: refs/heads/trunk Commit: 24e9d6310927edc283efdcf5adb3cd3ce9a80fe0 Parents: c5b6a33 61dc590 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sat Oct 12 23:56:22 2013 +0700 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sat Oct 12 23:56:22 2013 +0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/stress/Session.java | 32 ++++++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/24e9d631/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/24e9d631/tools/stress/src/org/apache/cassandra/stress/Session.java ---------------------------------------------------------------------- diff --cc tools/stress/src/org/apache/cassandra/stress/Session.java index 49449eb,242fa14..c26c759 --- a/tools/stress/src/org/apache/cassandra/stress/Session.java +++ b/tools/stress/src/org/apache/cassandra/stress/Session.java @@@ -24,10 -24,9 +24,12 @@@ import java.nio.ByteBuffer import java.util.*; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.commons.cli.*; +import org.apache.commons.lang3.StringUtils; + import com.yammer.metrics.Metrics; + + import org.apache.cassandra.auth.IAuthenticator; import org.apache.cassandra.cli.transport.FramedTransportFactory; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.EncryptionOptions;
