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

527 Commits

Author SHA1 Message Date
Sylvain Lebresne 7b32dbd4db Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	build.xml
 2014-03-26 15:38:13 +01:00
Sylvain Lebresne d7cb970053 Add CqlRecordReader to take advantage of native CQL pagination 
patch by alexliu68; reviewed by pkolaczk for CASSANDRA-6311
 2014-03-26 15:34:59 +01:00
Sylvain Lebresne 6df3163752 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	build.xml
 2014-03-25 16:52:21 +01:00
Sylvain Lebresne b0841d8fee Revert "Add CqlRecordReader to take advantage of native CQL pagination" 
This reverts commit 3b708f9989.

Conflicts:

	CHANGES.txt
 2014-03-25 16:49:10 +01:00
Sylvain Lebresne a7c4659dbd Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	build.xml
 2014-03-21 15:31:25 +01:00
Sylvain Lebresne 3b708f9989 Add CqlRecordReader to take advantage of native CQL pagination 
patch by alexliu68; reviewed by pkolaczk for CASSANDRA-6311
 2014-03-21 15:26:41 +01:00
Jonathan Ellis dd60ab4740 fix CRLF in bash scripts when building on Windows 
patch by Peter; reviewed by Joshua McKenzie for CASSANDRA-6798
 2014-03-17 11:37:10 -05:00
Mikhail Stepura 22b271689b Merge branch 'cassandra-2.0' into cassandra-2.1 2014-03-14 13:51:29 -07:00
Mikhail Stepura 245038fd25 Fix "codecoverage" task 2014-03-14 13:49:49 -07:00
Dave Brosius 729da03c53 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-03-14 00:46:32 -04:00
Dave Brosius c49d33633a fix duplicate classes between cassandra-all and cassandra-thrift 
patch by dbrosius reviewed by jbellis for CASSANDRA-5833
 2014-03-14 00:43:10 -04:00
Sylvain Lebresne 656edc529d Update version, news and license for 2.0.6 2014-03-07 13:20:03 +01:00
Jonathan Ellis 728f677b0f Merge branch 'cassandra-2.0' into cassandra-2.1 2014-03-06 09:40:56 -06:00
Jonathan Ellis c2ec94b354 update cobertura version 
patch by Ed Capriolo for CASSANDRA-6800
 2014-03-06 09:40:46 -06:00
Brandon Williams 4cf8a8a6c3 Add hadoop progressable compatibility. 
Patch by Ben Coverston, reviewed by brandonwilliams for CASSANDRA-5201
 2014-03-05 12:54:42 -06:00
Brandon Williams 249230834c Add hadoop progressable compatibility. 
Patch by Ben Coverston, reviewed by brandonwilliams for CASSANDRA-5201
 2014-03-05 11:21:35 -06:00
Brandon Williams 7bd23316e9 Add new stress deps to packaging. 
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-6762
 2014-02-25 15:51:25 -06:00
Jonathan Ellis f628bd8a4d Merge branch 'cassandra-2.0' into cassandra-2.1 2014-02-18 11:22:24 -06:00
Jonathan Ellis 500c62d6b9 Allow per-dc enabling of hints 
patch by Sankalp Kohli; reviewed by Lyuben Todorov for CASSANDRA-6157
 2014-02-18 11:21:13 -06:00
Sylvain Lebresne 1828b929c2 Remove now unused depency on snaptree 2014-02-17 17:23:04 +01:00
Sylvain Lebresne 9f14856234 Versions and licenses in preparation for 2.1.0-beta1 release 2014-02-17 17:06:10 +01:00
Jonathan Ellis ee020c9446 Revert 6157 until we can commit to 2.0 and merge forwards 
This reverts commit f64b31c426.
 2014-02-15 11:38:51 -06:00
Jonathan Ellis f64b31c426 wip 2014-02-15 10:18:12 -06:00
Mikhail Stepura 21ec021831 Fix eclipse build for trunk 2014-02-14 12:08:26 -08:00
Brandon Williams f007a35357 Use EB HadoopCompat for compat with Hadoop 0.2.x 
Patch by Ben Coversaton, reviewed by brandonwilliams for CASSANDRA-5201
 2014-02-11 15:53:43 -06:00
Brandon Williams b9aece45e9 Use EB HadoopCompat for compat with Hadoop 0.2.x 
Patch by Ben Coversaton, reviewed by brandonwilliams for CASSANDRA-5201
 2014-02-11 09:34:49 -06:00
Brandon Williams 01cf29c3e9 Merge branch 'cassandra-2.0' into trunk 2014-02-07 13:19:50 -06:00
Brandon Williams 130d135a63 Merge branch 'cassandra-1.2' into cassandra-2.0 2014-02-07 13:19:38 -06:00
Brandon Williams c70f6d80bd add target to run specific test methods 2014-02-07 13:19:26 -06:00
Mikhail Stepura 88bef0cbf3 Switched to Guava 16.0 for CASSANDRA-6639 2014-02-06 20:22:28 -08:00
Yuki Morishita 0f83a8610b update stream-lib for HLL++ serialization thread-safety 2014-02-05 20:44:20 -06:00
Sylvain Lebresne 178e086f1a Update news, version in preparation for 1.2.15 2014-02-05 08:47:20 +01:00
Aleksey Yeschenko aa29b6af6a Merge branch 'cassandra-2.0' into trunk 
Conflicts:
	build.xml
	src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
	src/java/org/apache/cassandra/db/context/CounterContext.java
	test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
 2014-02-02 02:37:14 -05:00
Brandon Williams 944c015175 unify test timeouts, exclude pig 2014-01-31 22:11:01 +01:00
Brandon Williams 8ecc6f1118 Merge branch 'cassandra-1.2' into cassandra-2.0 2014-01-31 14:08:15 -06:00
Brandon Williams 3f9875c7f5 exclude pig from test target 2014-01-31 14:08:07 -06:00
Brandon Williams 23e86ee15c Merge branch 'cassandra-1.2' into cassandra-2.0 2014-01-31 12:20:41 -06:00
Brandon Williams 9a024b8018 unify test timeouts, exclude pig 2014-01-31 12:20:18 -06:00
Sylvain Lebresne bcb294de08 Update version for 2.0.5 release 2014-01-31 16:06:12 +01:00
Sylvain Lebresne 6a9314408c Update versions and licenses for 1.2.14 release 2014-01-31 10:45:03 +01:00
Jonathan Ellis 4b54b8acd2 remove Table.switchlock and introduce o.a.c.utils.memory package 
patch by Benedict Elliott Smith; reviewed by jbellis for CASSANDRA-5549
 2014-01-30 17:09:18 -06:00
Jonathan Ellis 2ba394676d bundle jna 4.0 
patch by Lyuben Todorov; reviewed by jbellis for CASSANDRA-5872
 2014-01-28 16:41:33 -06:00
Pavel Yaskevich 25d2893dd0 Merge branch 'cassandra-2.0' into trunk 2014-01-10 17:25:40 -08:00
Pavel Yaskevich c543215918 update thrift-server to version 0.3.3 to fix CASSANDRA-6373 and CASSANDRA-6407 2014-01-10 17:20:22 -08:00
Jonathan Ellis 892d8e699c refactor nodetool, encapsulating each command into a subclass 
patch by Clément Lardeur; reviewed by Mikhail Stepura for CASSANDRA-6381
 2014-01-10 12:12:34 -06:00
Eric Evans d56f8f2930 Update versioning for 2.0.4 release 2013-12-27 12:42:15 -06:00
belliottsmith 2e1e98ad04 Improve Stress Tool 
patch by Benedict; reviewed by Pavel Yaskevich for CASSANDRA-6199
 2013-12-23 18:05:43 -08:00
Dave Brosius 27dea4b938 add stream.jar to the poms 2013-12-22 00:17:14 -05:00
Brandon Williams 343a6472d8 Pig: fix duplicate schema error 
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6309
 2013-12-13 11:40:20 -06:00
Sylvain Lebresne 6ab82a4698 Update versions for 1.2.13 release 2013-12-11 15:17:25 +01:00