natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
14,920 Commits 17 Branches 338 Tags 653 MiB
Commit Graph

208 Commits

Author SHA1 Message Date
Benedict Elliott Smith 8215744ffb Merge branch 'cassandra-2.1' into trunk 2014-09-16 20:48:57 +01:00
Benedict Elliott Smith 109313c3ed cassandra-stress: fix support for NetworkTopologyStrategy 
patch by benedict; reviewed by yukim for CASSANDRA-7945
 2014-09-16 20:48:29 +01:00
Benedict Elliott Smith 7fc0e9efea Merge branch 'cassandra-2.1' into trunk 2014-09-16 06:29:00 +01:00
Benedict Elliott Smith 4efb6dc8c1 ninja fix cassandra-stress pre-2.1.1 compatibility 2014-09-16 06:28:01 +01:00
Dave Brosius ff6042968c use %n for newlines in printfs 2014-09-15 23:54:40 -04:00
Jake Luciani 7b5164f398 Merge branch 'cassandra-2.1' into trunk 2014-09-15 12:22:09 -04:00
Jake Luciani b3573f3d3b Better error checking of stress profile 
patch by tjake; reviewed by belliottsmith for CASSANDRA-7716
 2014-09-15 12:20:43 -04:00
Benedict Elliott Smith 969967cf9f Merge branch 'cassandra-2.1' into trunk 2014-09-15 16:56:50 +01:00
Benedict Elliott Smith 6bff5a3318 ninja-fix cassandra-stress totalGcStats metric 2014-09-15 16:56:45 +01:00
Benedict Elliott Smith 58985409c9 Merge branch 'cassandra-2.1' into trunk 2014-09-14 13:51:08 +01:00
Benedict Elliott Smith a6678a273d ninja fix rethrow InterruptedException in cassandra-stress Timing.snap 2014-09-14 13:50:38 +01:00
Benedict Elliott Smith 14b1c96072 Merge branch 'cassandra-2.1' into trunk 2014-09-14 09:13:44 +01:00
Benedict Elliott Smith eea042b0b0 cassandra-stress supports whitelist mode for node config 
patch by benedict; reviewed by tjake for CASSANDRA-7658
 2014-09-14 09:13:18 +01:00
Benedict Elliott Smith 477c54c03c Merge branch 'cassandra-2.1' into trunk 2014-09-14 09:09:57 +01:00
Benedict Elliott Smith 0e652e7548 GCInspector more closely tracks GC; cassandra-stress and nodetool report it 
patch by benedict; reviewed by tjake
 2014-09-14 09:09:37 +01:00
Brandon Williams 965f5227bb Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/cassandra into trunk 2014-09-12 12:16:58 -05:00
Brandon Williams 314b1f1770 Don't use _ as a reference 2014-09-12 12:16:47 -05:00
Benedict Elliott Smith 1963b7f032 Merge branch 'cassandra-2.1' into trunk 2014-09-11 12:36:08 +07:00
Benedict Elliott Smith 73b2dcc165 cassandra-stress: ninja fix profile param for user command to required, and print required fields first 2014-09-11 12:35:29 +07:00
Benedict Elliott Smith 51a6f0f7fa Merge branch 'cassandra-2.1' into trunk 2014-09-11 11:28:36 +07:00
Benedict Elliott Smith 530c9f52c3 cassandra-stress: merge 7468 into 2.1, and ninja-fix duration setting for user command 2014-09-11 11:27:34 +07:00
Dave Brosius 1198df4beb Merge branch 'cassandra-2.1' into trunk 2014-09-08 22:21:59 -04:00
Dave Brosius 4bdbdc1e39 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-09-08 22:21:13 -04:00
Dave Brosius 852f084f03 fix stress metrics format strings 2014-09-08 22:20:29 -04:00
Benedict Elliott Smith a44d641e8f fix merge of 7519 2014-09-08 08:06:36 +07:00
Benedict Elliott Smith eec381e0d6 fixup 2014-09-07 21:32:55 +07:00
Benedict Elliott Smith b170b3caa2 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	tools/stress/src/org/apache/cassandra/stress/StressAction.java
	tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommand.java
 2014-09-07 21:32:36 +07:00
Benedict Elliott Smith 77d0c17574 Merge branch 'cassandra-2.1.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	build.xml
	debian/changelog
	tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandPreDefinedMixed.java
	tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandUser.java
 2014-09-07 21:23:52 +07:00
Benedict Elliott Smith 0580fb2b77 Improve stress workload realism 
patch by benedict; reviewed by tjake for CASSANDRA-7519
 2014-09-07 21:19:58 +07:00
Dave Brosius 5cc7a11ab8 fix boxing confusion 2014-09-06 14:39:54 -04:00
Dave Brosius 182051c453 simplify/avoid possible npes 2014-09-06 14:22:08 -04:00
Sylvain Lebresne bc63083217 Merge branch 'cassandra-2.1' into trunk 2014-08-22 16:17:01 +02:00
Sylvain Lebresne 94f1107eca Merge branch 'cassandra-2.1.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
 2014-08-22 16:16:46 +02:00
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 05eac99d35 Merge branch 'cassandra-2.1' into trunk 2014-08-08 12:44:32 +02:00
Sylvain Lebresne fcb79b799b Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-08-08 12:44:14 +02:00
Sylvain Lebresne 6ba4e72580 Update stress to use driver 2.0.4 2014-08-08 12:43:52 +02:00
Jonathan Ellis f47863e13c fix warnings for _ as identifier 
patch by Robert Stupp; reviewed by jbellis for CASSANDRA-7675
 2014-08-04 07:28:58 -05:00
Benedict Elliott Smith c0fc698826 Merge branch 'cassandra-2.1' into trunk 2014-08-01 21:49:28 +01:00
Benedict Elliott Smith 24f6f038ef Fix serialization of command ratios in cassandra-stress/stressd 
patch by rspitzer; reviewed by benedict for CASSANDRA-7559
 2014-08-01 21:48:19 +01:00
Benedict Elliott Smith 63393eb248 Merge branch 'cassandra-2.1' into trunk 2014-08-01 21:39:56 +01:00
Benedict Elliott Smith a182ea00ba Fix column name serialization for cassandra-stress/stressd 
patch by rspitzer; reviewed by benedict for CASSANDRA-7608
 2014-08-01 21:37:55 +01:00
Jake Luciani e3fa11bf4a Merge branch 'cassandra-2.1' into trunk 2014-08-01 09:33:46 -04:00
Jake Luciani 1921b98599 Make default stress batches logged 2014-08-01 09:32:31 -04:00
Jake Luciani 7633d92058 Merge branch 'cassandra-2.1' into trunk 2014-08-01 09:25:21 -04:00
Jake Luciani d667556d06 remove seed from stress profile. cleanup yamls. ninja 2014-08-01 09:23:02 -04:00
Jonathan Ellis 777384131b Merge branch 'cassandra-2.1' into trunk 2014-07-31 15:49:54 -05:00
Jonathan Ellis abe85903b3 add cassandra.in.bat 2014-07-31 15:49:38 -05:00
Jonathan Ellis aa25f67eaf Merge branch 'cassandra-2.1' into trunk 2014-07-25 17:26:05 -05:00
Jonathan Ellis 3e489dad7d Clean up Windows batch scripts 
patch by Josh McKenzie; reviewed by Ala' Alkhaldi for CASSANDRA-7619
 2014-07-25 17:23:11 -05:00