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

198 Commits

Author SHA1 Message Date
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
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
Jonathan Ellis 4edfe4ee78 add airline and javax.inject jars 2014-01-11 18:56:59 -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
belliottsmith 2e1e98ad04 Improve Stress Tool 
patch by Benedict; reviewed by Pavel Yaskevich for CASSANDRA-6199
 2013-12-23 18:05:43 -08:00
Yuki Morishita 642ce366d9 Add cardinality estimator for key count estimation 
patch by yukim; reviewed by jbellis for CASSANDRA-5906
 2013-12-20 14:14:46 -06:00
Dave Brosius 460fc03ee1 Merge branch 'cassandra-2.0' into trunk 2013-10-23 21:32:03 -04:00
Dave Brosius 3cf18d71dc update lz4 license to 1.2.0 2013-10-23 21:25:26 -04:00
Sylvain Lebresne 9bf5b45d88 Merge branch 'cassandra-2.0' into trunk 
Conflicts:
	build.xml
	lib/lz4-1.1.2.jar
 2013-10-23 11:25:12 +02:00
Sylvain Lebresne 93da683e0c Update LZ4 lib to 1.2.0 2013-10-23 11:20:23 +02:00
Brandon Williams 3017dd34f7 Merge branch 'cassandra-2.0' into trunk 2013-10-18 10:08:45 -05:00
Brandon Williams 718e3ec8b7 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-10-18 10:08:37 -05:00
Brandon Williams 300f153a71 match internal only filename to internal directory version 2013-10-18 10:08:25 -05:00
Jason Brown 231b345ffd Merge branch 'cassandra-2.0' into trunk 2013-10-17 14:09:45 -07:00
Jason Brown 20d91b0ba9 add update cql-internal-only zip 2013-10-17 14:06:29 -07:00
Jason Brown 5c0c84b3d1 implementing CL.LOCAL_ONE 2013-10-17 13:37:12 -07:00
Jonathan Ellis 023589bf30 Merge branch 'cassandra-2.0' into trunk 2013-10-01 14:25:57 -05:00
Jonathan Ellis 32c3f44a68 Add configurable metrics reporting 
patch by Chris Burroughs; reviewed by Tyler Hobbs for CASSANDRA-4430
 2013-10-01 14:25:42 -05:00
Jonathan Ellis 681312393b merge from 2.0 2013-09-19 16:54:26 -05:00
Pavel Yaskevich b4bc50e44d bump Distruptor Thrift Server version to 0.3.2 2013-09-19 14:08:38 -07:00
Jonathan Ellis b95fd08187 upgrade to CLHM 1.4 
patch by jbellis for CASSANDRA-5821
 2013-09-17 15:52:19 -05:00
Aleksey Yeschenko d57ce28450 Merge branch 'cassandra-2.0' into trunk 2013-09-12 18:45:34 +03:00
Aleksey Yeschenko 53f19c8495 Update guava to 15.0 2013-09-12 18:44:27 +03:00
Sylvain Lebresne 5ea3b15384 Merge branch 'cassandra-2.0' into trunk 
Conflicts:
	lib/licenses/slf4j-log4j12-1.7.2.txt
 2013-09-03 16:38:09 +02:00
Sylvain Lebresne a3534910e1 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-09-03 16:36:32 +02:00
Sylvain Lebresne 8c33e72e1f License filename renaming 2013-09-03 16:36:19 +02:00
Sylvain Lebresne 14e7895e59 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-09-03 16:35:27 +02:00
Sylvain Lebresne c7a835d1f4 Add back updated licenses 2013-09-03 16:30:10 +02:00
Sylvain Lebresne 4ca9217a2b Merge tag 'cassandra-2.0.0' into cassandra-2.0 
Apache Cassandra 2.0.0 release
 2013-09-03 16:28:57 +02:00
Sylvain Lebresne 196038b73e Update netty dependency to 3.6.6 2013-09-02 18:00:27 +02:00
Jonathan Ellis ca037b08e8 Merge branch 'cassandra-2.0' into trunk 2013-08-30 13:55:47 -05:00
Jonathan Ellis 583d98b475 rename license file 2013-08-30 13:55:45 -05:00
Jonathan Ellis 2be4241380 merge from 1.2 2013-08-30 13:55:06 -05:00
Jonathan Ellis de1a91fe5e Upgrade metrics-core to version 2.2.0 
patch by jbellis for CASSANDRA-5947
 2013-08-30 13:50:12 -05:00
Jonathan Ellis 3205e5dbbc Revert CASSANDRA-5838 2013-08-30 13:35:16 -05:00
Marcus Eriksson 14da6bca01 Switch to LZ4 compression for internode communication. 
Patch by marcuse, reviewed by jbellis for CASSANDRA-5887.
 2013-08-30 09:30:14 +02:00
Aleksey Yeschenko 84dfa06475 Merge branch 'cassandra-2.0' into trunk 2013-08-30 03:49:21 +03:00
Aleksey Yeschenko d6be037b37 Fix licenses 2013-08-30 03:48:45 +03:00
Aleksey Yeschenko 5b5d41d4b8 Merge branch 'cassandra-2.0' into trunk 
Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
	tools/stress/src/org/apache/cassandra/stress/Session.java
	tools/stress/src/org/apache/cassandra/stress/StressStatistics.java
 2013-08-30 03:03:29 +03:00
Aleksey Yeschenko bffd9ea8eb Upgrade Thrift to 0.9.1 
patch by Carl Yeksigian and Jake Farrell; reviewed by Aleksey Yeschenko
for CASSANDRA-5923
 2013-08-30 02:57:12 +03:00
Sylvain Lebresne 03045ca22b Update versions for 2.0 final release 2013-08-28 13:37:31 +02:00
Dave Brosius 5e33b9b039 remove servlet-api and license, unused since avro removal 2013-08-21 22:17:00 -04:00
Dave Brosius 6f114c9318 Merge branch 'cassandra-2.0' into trunk 2013-08-21 21:53:01 -04:00
Dave Brosius 372af0854f Merge branch 'cassandra-1.2' into cassandra-2.0.0 2013-08-21 21:50:30 -04:00
Dave Brosius 4bc8c895db remove licenses for jars not used 2013-08-21 21:49:34 -04:00
Yuki Morishita 72a702a3d4 Merge branch 'cassandra-1.2' into cassandra-2.0.0 2013-08-21 15:41:05 -05:00
Yuki Morishita 0db3413548 add metrics-core license 2013-08-21 15:40:26 -05:00