6 Commits

Author	SHA1	Message	Date
Sylvain Lebresne	8da134377a	Merge branch 'cassandra-2.0' into cassandra-2.1.0 ... Conflicts: build.xml src/java/org/apache/cassandra/cql3/statements/BatchStatement.java	2014-08-22 16:15:50 +02:00
Sylvain Lebresne	6ba4e72580	Update stress to use driver 2.0.4	2014-08-08 12:43:52 +02:00
Sylvain Lebresne	43092aac96	Add back Netty 3 jar to stress lib dir for #6911	2014-03-25 13:52:35 +01:00
Sylvain Lebresne	ce94010b9b	Update java-driver to 2.0 final for stress ... patch by djatnieks; reviewed by slebresne for CASSANDRA-6777	2014-03-04 12:07:49 +01:00
Sylvain Lebresne	0d0acac6c5	Fix stress	2014-02-12 18:27:32 +01:00
belliottsmith	2e1e98ad04	Improve Stress Tool ... patch by Benedict; reviewed by Pavel Yaskevich for CASSANDRA-6199	2013-12-23 18:05:43 -08:00