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

326 Commits

Author SHA1 Message Date
T Jake Luciani 89344f182a Merge branch 'cassandra-2.1' into cassandra-2.2 2016-05-18 09:09:43 -04:00
Eduard Tudenhoefner 9359af2ea5 CASSANDRA-10828: Allow usage of multiplier in start value of population sequence 2016-05-18 09:09:06 -04:00
Yuki Morishita 1d7c0bc210 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-04-25 20:05:06 -05:00
Wei Deng c43cf8d79b Change order of directory searching for cassandra.in.sh 
patch by Wei Deng; reviewed by yukim for CASSANDRA-11628
 2016-04-25 20:03:27 -05:00
Stefan Podkowinski 106750c78e Add cassandra-stress keystore option (CASSANDRA-9325) 
* Prevents stress tool from checking keystore at .conf/keystore even if not needed
 * Adds keystore -transport option in case client verification is used on server

Patch by Stefan Podkowinski; reviewed by T Jake Luciani for CASSANDRA-9325
 2016-03-31 10:09:24 -04:00
Yuki Morishita b6d0a752e4 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-03-22 16:04:58 -05:00
Jeremiah D Jordan 42644c3240 Backport CASSANDRA-10679 
patch by yukim; reviewed by Jeremiah Jordan for CASSANDRA-9598
 2016-03-22 15:56:06 -05:00
Stefania Alborghetti 202cf9b0be Match cassandra-loader options in COPY FROM (2.2 version) 
patch by Stefania; reviewed by pauloricardomg for CASSANDRA-9303
 2016-01-06 17:56:30 +01:00
Stefania Alborghetti 11716547f8 Match cassandra-loader options in COPY FROM 
patch by Stefania; reviewed by pauloricardomg for CASSANDRA-9303
 2016-01-06 17:54:49 +01:00
ZhaoYang b03ce9fd47 Add new types to Stress 
patch by ZhaoYang; reviewed by Benjamin Lerer for CASSANDRA-9556
 2015-12-16 15:06:06 +01:00
Benjamin Lerer 263763ab9b Merge branch cassandra-2.1 into cassandra-2.2 2015-12-14 10:28:05 +01:00
Benjamin Lerer 9b30d6572f Make Stress compiles within eclipse 
patch by Benjamin Lerer; reviewed by Jake Luciani for CASSANDRA-10807
 2015-12-14 10:22:30 +01:00
Benjamin Lerer 7e3e1191b9 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-12-03 21:30:45 +01:00
Benjamin Lerer b876424228 Fix stress profile parsing on Windows 
patch by Benjamin Lerer; reviewed by Joshua McKenzie for CASSANDRA-10808
 2015-12-03 21:25:42 +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
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 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
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
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
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 d6d32d26ff Change Windows Kernel default timer resolution 
Patch by jmckenzie; reviewed by tjake for CASSANDRA-9634
 2015-06-22 17:27:08 -04: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 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 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
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