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

435 Commits

Author SHA1 Message Date
Robert Stupp 6f848db4c0 Merge branch 'cassandra-3.0' into trunk 2015-10-26 13:39:38 +01:00
Robert Stupp db7feb4c25 Remove token generator 
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-5261
 2015-10-26 13:38:30 +01:00
Ryan McGuire e4467a0f6d Provide graphing tool w/cassandra-stress 
Patch by rmcguire; reviewed by jmckenzie for CASSANDRA-7918
 2015-10-21 15:40:26 -04:00
T Jake Luciani 16b9f8bba4 Choose better poolingOptions for protocol v4 in cassandra-stress 
Patch by tjake; reviewed by Alan Boudreault for CASSANDRA-10182
 2015-08-27 16:00:18 -04:00
Benedict Elliott Smith 342e33ffb1 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-08-23 11:30:57 +01:00
Benedict Elliott Smith a6d6540446 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-08-23 11:30:43 +01:00
phact 5bee617fea Support BigDecimal in cassanra-stress 
patch by Sebastian Estevez; reviewed by Benedict for CASSANDRA-10048
 2015-08-23 11:27:16 +01:00
Sam Tunnicliffe 06c130e3cb Move 2i metadata out of system_schema.columns and ColumnDefinition 
Patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko and Robert Stupp
for CASSANDRA-6717
 2015-08-18 14:59:44 +01:00
Joshua McKenzie d054181b9e Merge branch 'cassandra-2.2' into cassandra-3.0 2015-08-11 12:35:28 -04:00
Paulo Motta 6c723101f7 Add sstablerepairedset.bat 
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-9982
 2015-08-11 12:34:51 -04:00
Marcus Eriksson 213aab8c1f Merge branch 'cassandra-2.2' into cassandra-3.0 
Conflicts:
	test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
 2015-08-11 10:21:54 +02:00
Marcus Eriksson 5431a88d7b Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
 2015-08-11 10:18:03 +02:00
Marcus Eriksson 012b987e26 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
 2015-08-11 10:11:15 +02:00
Marcus Eriksson 028e7cb5af Add tool to find why expired sstables are not getting dropped 
Patch by marcuse; reviewed by stefania for CASSANDRA-10015
 2015-08-11 09:31:30 +02:00
Joshua McKenzie 4d1b3d2687 Merge branch 'cassandra-2.2' into trunk 2015-08-03 14:53:21 -04:00
Paulo Motta 4765cd6f17 Add sstableofflinerelevel.bat and sstablelevelreset.bat 
Patch by pmotta; reviewed by pthompson for CASSANDRA-9942
 2015-08-03 14:52:23 -04:00
Benedict Elliott Smith 019471a567 sysexit on cassandra-stress main thread error 
patch by benedict; reviewed by ryan for CASSANDRA-9864
 2015-07-22 23:38:51 +01:00
T Jake Luciani 5e89136d10 Allow extra schema definitions in cassandra-stress yaml 
Patch by tjake; reviewed by benedict for CASSANDRA-9850
 2015-07-21 11:28:38 -04:00
T Jake Luciani f708c1e416 Fix default ratio in stress (ninja) 2015-07-02 10:52:27 -04:00
T Jake Luciani 6d29ed0662 New option for cassandra-stress to leave a ratio of columns null 
Patch by tjake; reviewed by Jim Witschey for (CASSANDRA-9522)
 2015-07-01 17:01:44 -04:00
Sylvain Lebresne a991b64811 Storage engine refactor, a.k.a CASSANDRA-8099 
Initial patch, see ticket for details
 2015-06-30 12:47:01 +02:00
T Jake Luciani 9a71238706 Merge branch 'cassandra-2.2' into trunk 2015-06-25 14:35:10 -04:00
Andrew Tolbert 26bd5124ef Optimize stress driver config for 2.2 
Patch by Andrew Tolbert; reviewed by tjake for CASSANDRA-9558
 2015-06-25 14:28:31 -04:00
Josh McKenzie bc9b0be321 Merge branch 'cassandra-2.2' into trunk 2015-06-24 12:13:15 -04:00
Stefania Alborghetti 01115f72fc 2.2 commit for CASSANDRA-9160 2015-06-24 12:11:46 -04:00
Stefania Alborghetti f797bfa4da Migrate CQL tests from dtest to unit tests 
Patch by stefania; reviewed by jmckenzie for CASSANDRA-9160
 2015-06-24 12:10:29 -04:00
Josh McKenzie 115ed236aa Merge branch 'cassandra-2.2' into trunk 2015-06-22 17:27:46 -04:00
Josh McKenzie d6d32d26ff Change Windows Kernel default timer resolution 
Patch by jmckenzie; reviewed by tjake for CASSANDRA-9634
 2015-06-22 17:27:08 -04:00
Chris Burroughs 8c19fd638d undeprecate cache recentHitRate metrics 
patch by Chris Burroughs; reviewed by benedict for CASSANDRA-6591
 2015-06-12 12:22:30 +01:00
stefania 17dd4ccc78 Remove FileCacheService, instead pooling buffers 
patch by stefania and benedict for CASSANDRA-8897
 2015-06-09 10:08:24 +01:00
Jonathan Ellis 823d8579c5 Merge branch 'cassandra-2.2' into trunk 2015-06-08 09:34:59 -05:00
Jonathan Ellis efb08ad308 merge from 2.1 2015-06-08 09:34:52 -05:00
Jonathan Ellis 46ce21c7b7 merge from 2.0 2015-06-08 09:34:16 -05:00
Stefania Alborghetti a8ceb2c650 Added quotes to CLASSPATH and JAVA for nix scripts, CASSANDRA-9529 2015-06-08 09:29:10 -05:00
Robert Stupp 78c03052c5 Merge branch 'cassandra-2.2' into trunk 2015-06-04 11:17:42 +02:00
Robert Stupp 16b02887df Integrate pre-release Java Driver 2.2-rc1, custom build 
patch by Robert Stupp; reviewed by Ariel Weisberg for CASSANDRA-9493
 2015-06-04 11:17:05 +02:00
Jonathan Ellis cc6d142983 Merge branch 'cassandra-2.2' into trunk 2015-06-01 10:28:01 -05:00
Jonathan Ellis c11644bbfb Merge branch 'cassandra-2.1' into cassandra-2.2 2015-06-01 10:27:55 -05:00
Jonathan Ellis 40c3ad6a0c merge from 2.0 2015-06-01 10:26:34 -05:00
Dave Brosius e994805749 simplify throws clauses wrt Thrift 2015-05-17 15:39:03 -04:00
T Jake Luciani a16c4fe0a5 Remove thrift schema creation when native driver is used 
Patch by tjake; reviewed by Aleksey Yeschenko for CASSANDRA-9374
 2015-05-15 09:40:03 -04:00
Robert Stupp 1e44d2bd8b Merge branch 'cassandra-2.1' into trunk 2015-05-14 10:39:19 +02:00
Robert Stupp 5e631a8fda Merge branch 'cassandra-2.0' into cassandra-2.1 2015-05-14 10:39:04 +02:00
Robert Stupp 1611ef3d19 token-generator - generated tokens too long 
Patch by Robert Stupp; Reviewed by Stefania for CASSANDRA-9300
 2015-05-14 10:35:35 +02:00
T Jake Luciani d26bfe9a4d fix stress to not use thrift unless requested 2015-05-12 15:37:45 -04:00
T Jake Luciani 5893472e7e Merge branch 'cassandra-2.1' into trunk 2015-05-12 14:55:07 -04:00
T Jake Luciani 8b5434f3df Add missing consistency levels to cassandra-stress 
Patch by Mario Lazaro; reviewed by tjake for CASSANDRA-9361
 2015-05-12 14:53:10 -04:00
Dave Brosius 2da468d9bb Merge branch 'cassandra-2.1' into trunk 2015-05-08 16:09:04 -04:00
Dave Brosius def6b5fa19 fixup last fix for bad lock guard 2015-05-08 16:08:36 -04:00
Dave Brosius 81c93084ba Merge branch 'cassandra-2.1' into trunk 2015-05-08 15:59:37 -04:00
Dave Brosius b66475c4e0 make sure lock gets unlocked 2015-05-08 15:58:54 -04:00
Dave Brosius 2096bcefd5 remove dead collections 2015-05-04 21:58:52 -04:00
Benedict Elliott Smith ed08402999 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	tools/stress/src/org/apache/cassandra/stress/generate/PartitionIterator.java
	tools/stress/src/org/apache/cassandra/stress/operations/SampledOpDistributionFactory.java
 2015-05-04 18:03:43 +01:00
Benedict Elliott Smith 3bee990ca2 cassandra-stress supports validation operations over user profiles 
patch by benedict; reviewed by snazy for CASSANDRA-8773
 2015-05-04 18:01:38 +01:00
Dave Brosius 87ef146b4c use short circuiting ops 2015-04-01 19:16:40 -04:00
Benedict Elliott Smith 6ad51477b0 Merge branch 'cassandra-2.1' into trunk 2015-03-24 13:42:53 +00:00
Benedict Elliott Smith 6b979f3191 permit n=1 in cassandra-stress 2015-03-24 13:42:48 +00:00
Dave Brosius b274aa1c7f use short-circuiting ops 2015-03-15 19:20:01 -04:00
T Jake Luciani f843b42e87 Merge branch 'cassandra-2.1' into trunk 2015-03-11 12:59:55 -04:00
T Jake Luciani 4646014851 Fix cassandra-stress so it respects the CL passed in user mode 
patch by tjake; reviewed by benedict for CASSANDRA-8948
 2015-03-11 12:47:08 -04:00
Benedict Elliott Smith e585c339d0 Merge branch 'cassandra-2.1' into trunk 2015-03-10 17:43:17 +00:00
Benedict Elliott Smith 81fe1a2a86 ninja fix cassandra-stress rank latencies 2015-03-10 17:43:06 +00:00
Benedict Elliott Smith 97d65d6d36 include missing files 2015-03-10 17:13:46 +00:00
Benedict Elliott Smith b7563f823e include missing files 2015-03-10 17:12:31 +00:00
Benedict Elliott Smith a0586f6929 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	tools/stress/src/org/apache/cassandra/stress/settings/OptionDistribution.java
 2015-03-10 14:26:30 +00:00
Benedict Elliott Smith 6bbfb5574e cassandra-stress prints per operation statistics, plus misc other stress updates 
patch by anthony cozzie, reviewed by benedict for CASSANDRA-8769
 2015-03-10 14:19:23 +00:00
T Jake Luciani b2d16f4cdd Merge branch 'cassandra-2.1' into trunk 2015-03-04 16:37:17 -05:00
T Jake Luciani 4176f9e78c make stress read-lookback optional 2015-03-04 16:36:33 -05:00
T Jake Luciani 4a1879c235 Merge branch 'cassandra-2.1' into trunk 2015-03-04 16:29:34 -05:00
T Jake Luciani 213b066957 ninja change stress read-lookback default to none 2015-03-04 16:28:56 -05:00
Benedict Elliott Smith a4221b7213 Merge branch 'cassandra-2.1' into trunk 2015-03-04 16:44:42 +00:00
Sebastian Estevez 7712e0ef07 cassandra-stress support for varint 
patch by sebastian estevez; reviewed by benedict for CASSANDRA-8882
 2015-03-04 16:44:14 +00:00
Dave Brosius dd825a5f06 Merge branch 'cassandra-2.1' into trunk 2015-03-03 21:54:03 -05:00
Dave Brosius 9499f7cb98 use long math for long results 2015-03-03 21:50:23 -05:00
Marcus Eriksson f257b669d4 Merge branch 'cassandra-2.1' into trunk 2015-03-02 12:53:33 +01:00
Marcus Eriksson 1e74dd0d10 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2015-03-02 12:49:12 +01:00
Marcus Eriksson 33a3a09cbf Tool to create a leveling based on an existing set of sstables. 
Patch by marcuse; reviewed by carlyeks for CASSANDRA-8301
 2015-03-02 11:41:25 +01:00
T Jake Luciani ea3ff25a0c Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	build.xml
 2015-02-20 11:37:55 -05:00
T Jake Luciani 407b5de67c Upgrade java-driver used by cassandra-stress 
patch by tjake; reviewed by benedict for CASSANDRA-8842
 2015-02-20 11:32:59 -05:00
Benedict Elliott Smith 62ee1473be Merge branch 'cassandra-2.1' into trunk 2015-02-11 16:39:14 +00:00
Benedict Elliott Smith f57ec8c464 ninja-fix literal escape string 2015-02-11 16:39:06 +00:00
Benedict Elliott Smith 827ad24389 Merge branch 'cassandra-2.1' into trunk 2015-02-11 16:12:14 +00:00
Benedict Elliott Smith c643bbc8d1 ninja fix whitespace parsing in cassandra-stress 
patch by benedict; reviewed by jake for CASSANDRA-8648
 2015-02-11 16:11:38 +00:00
Benedict Elliott Smith 24bc6a0386 Merge branch 'cassandra-2.1' into trunk 2015-01-28 22:51:01 +00:00
Benedict Elliott Smith 7cd1102606 Update tools/stress/README.txt 
patch by ptnapoleon; reviewed by benedict for CASSANDRA-7933
 2015-01-28 22:49:33 +00:00
Dave Brosius b30cdd9a7e import cleanups 2015-01-25 22:03:22 -05:00
Benedict Elliott Smith 184bb65fca Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	CHANGES.txt
 2015-01-21 16:52:20 +00:00
Benedict Elliott Smith 1435b9a87a Fix cassandra-stress user-mode truncation of partition generation 
patch by benedict; reviewed by tjake for CASSANDRA-8608
 2015-01-21 16:50:55 +00:00
Yuki Morishita 7bd6d56b5a Merge branch 'cassandra-2.1' into trunk 2015-01-12 11:52:13 -06:00
Yuki Morishita f136bacb92 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-01-12 11:51:00 -06:00
Jimmy Mårdell 9e5a4fad7d Make sstablemetadata work outside install dir 
patch by Jimmy Mårdell; reviewed by yukim for CASSANDRA-8579
 2015-01-12 11:50:25 -06:00
T Jake Luciani 977cbddc44 Merge branch 'cassandra-2.1' into trunk 2014-12-22 09:01:01 -05:00
T Jake Luciani 29ff2d26f8 Cassandra stress user defined writes should populate sequentially 
Patch by tjake; reviewed by Benedict for CASSANDRA-8524
 2014-12-22 08:59:12 -05:00
Benedict Elliott Smith e6c5982fa3 Merge branch 'cassandra-2.1' into trunk 2014-12-17 09:28:17 +00:00
Benedict Elliott Smith f852401166 fix up misapply of CASSANDRA-7964 nits 2014-12-17 09:27:47 +00:00
T Jake Luciani dc1bc81f6a Merge branch 'cassandra-2.1' into trunk 2014-12-16 15:27:43 -05:00
T Jake Luciani 93f679e00f Add missing consistency levels to cassandra-stress 
Patch by Liang Xie; Reviewed by tjake for CASSANDRA-8253
 2014-12-16 15:24:40 -05:00
T Jake Luciani 9acf97a897 Merge branch 'cassandra-2.1' into trunk 2014-12-15 11:39:24 -05:00
T Jake Luciani f0767fdf49 avoid mixed case ks/table names in stress (ninja) 2014-12-15 11:39:00 -05:00
T Jake Luciani 088ffb2b50 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	tools/stress/src/org/apache/cassandra/stress/settings/SettingsMode.java
 2014-12-15 10:51:30 -05:00
T Jake Luciani a78451e5c6 Add auth support to cassandra-stress 
Path by Mike Adamson; reviewed by tjake for CASSANDRA-7985
 2014-12-15 10:39:55 -05:00
Benedict Elliott Smith 5876d93424 Merge branch 'cassandra-2.1' into trunk 2014-12-12 15:07:34 +00:00
Benedict Elliott Smith 597a1d5db2 cassandra-stress simultaneous inserts over same seed 
(take two)

patch by benedict; reviewed by rstupp CASSANDRA-7964
 2014-12-12 15:07:15 +00:00
Benedict Elliott Smith 36280a0783 Merge branch 'cassandra-2.1' into trunk 2014-12-12 14:10:04 +00:00
Benedict Elliott Smith 6c579a0102 cassandra-stress simultaneous inserts over same seed 
patch by benedict; reviewed by rstupp CASSANDRA-7964
 2014-12-12 14:09:37 +00:00
Benedict Elliott Smith add839d317 Merge branch 'cassandra-2.1' into trunk 2014-12-12 13:44:52 +00:00
Benedict Elliott Smith cdba5aac9b Reduce cassandra-stress sampling memory requirements 
patch by benedict; reviewed by branimir for CASSANDRA-7926
 2014-12-12 13:44:34 +00:00
T Jake Luciani 7d9acdb107 Merge branch 'cassandra-2.1' into trunk 2014-12-08 10:21:52 -05:00
T Jake Luciani c1610f6daf Add errors setting to stress help, ninja 2014-12-08 10:20:14 -05:00
T Jake Luciani 25314c2046 Merge branch 'cassandra-2.1' into trunk 2014-12-01 16:06:53 -05:00
T Jake Luciani 9c0f5753f3 Improve error message when stress is having GC issues (ninja) 2014-12-01 16:05:09 -05:00
Robert Stupp 794d68b51b Support for UDTs, tuples, and collections in UDFs 
Patch by Robert Stupp; reviewed by Tyler Hobbs for CASSANDRA-7563
 2014-11-26 17:49:45 -06:00
Tyler Hobbs fb4356a36a Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
	src/java/org/apache/cassandra/db/marshal/ListType.java
	src/java/org/apache/cassandra/db/marshal/TypeParser.java
	src/java/org/apache/cassandra/serializers/ListSerializer.java
	src/java/org/apache/cassandra/serializers/MapSerializer.java
 2014-11-11 13:33:31 -06:00
Tyler Hobbs ee55f361b7 Support for frozen collections 
Patch by Tyler Hobbs; reviewed by Sylvain Lebresne for CASSANDRA-7859
 2014-11-11 12:40:48 -06:00
Jake Luciani 19c2d22e93 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	NEWS.txt
	build.xml
 2014-11-05 16:04:24 -05:00
Jake Luciani 44e9f23d4f Prep for 2.1.2 2014-11-05 15:56:15 -05:00
T Jake Luciani 030aa57cd2 Merge branch 'cassandra-2.1' into trunk 2014-10-29 21:23:38 -04:00
T Jake Luciani bb8cc62146 add jmxPort to stress args (ninja) 2014-10-29 21:23:07 -04:00
Jake Luciani 0368e97ee4 Extend Descriptor to include a format value and refactor reader/writer apis 
patch by tjake; reviewed by Marcus Eriksson for CASSANDRA-7443
 2014-10-23 11:10:55 -04:00
Jake Luciani 54e4247812 Merge branch 'cassandra-2.1' into trunk 2014-10-07 12:22:14 -04:00
Jake Luciani 67d476d7c3 Force exit vs trying to cleanup all threads for stress 2014-10-07 12:21:06 -04:00
Jake Luciani bc246e1326 Merge branch 'cassandra-2.1' into trunk 2014-10-06 10:38:03 -04:00
Jake Luciani a8052d7c81 Fix more stress bugs (ninja) 2014-10-06 10:36:41 -04:00
Jake Luciani 50c5da991c Merge branch 'cassandra-2.1' into trunk 2014-10-03 16:59:30 -04:00
Jake Luciani aca80da38c ninja add support for yaml profile as a url 2014-10-03 16:59:03 -04:00
Benedict Elliott Smith 7762518745 Merge branch 'cassandra-2.1' into trunk 2014-09-20 08:44:43 +01:00
Benedict Elliott Smith eecc034b68 ninja-fix stress: rate limit not honoured for warmup, and 'auto' rate mode optional with thread ranges 2014-09-20 08:44:37 +01:00
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