Commit Graph

217 Commits

Author SHA1 Message Date
Mikhail Stepura a3effe6698 Support new UDT serialization format for CQLSH
patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7261
2014-05-21 13:27:55 -07:00
Mikhail Stepura 0f706c528e Ninja: thrift-server-0.3.5.jar for CASSANDRA-6285 2014-05-19 14:33:19 -07:00
Mikhail Stepura 98696714fb Ninja: removed old cassandra-dbapi licenses. Added new one for ptyhon-driver 2014-05-19 14:02:53 -07:00
Jake Luciani 4ee372106f Followup commit to fix maven deps on boundary's NBHM for CASSANDRA-7128 2014-05-14 09:02:45 -04:00
T Jake Luciani f0575f153b high-scale-lib upgrade
Patch by tjake; reviewed by Benedict Elliott Smith for CASSANDRA-7128
2014-05-05 16:37:22 -04:00
Dave Brosius 9432870658 add license for commons-math3.3.2 2014-05-02 23:34:33 -04:00
Dave Brosius 6708d05ec5 netty >= version 4.0 now has an artifact name of netty-all 2014-05-02 23:07:34 -04:00
Dave Brosius df62c62617 fix logback version string typo: 1.1.12 s/b 1.1.2 2014-05-02 22:52:11 -04:00
Mikhail Stepura 31cd61387e Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-01 15:21:22 -07:00
Mikhail Stepura 26633caa9c Patched version of Disruptor Thrift Server
patch by Mikhail Stepura; reviewed by Brandon Williams for CASSANDRA-6545
2014-05-01 15:03:24 -07:00
Dave Brosius f3d8ecf84c update logback to version 1.1.2 2014-04-02 20:53:58 -04:00
belliottsmith cbf304ebd0 Update native server to Netty 4
patch by benedict; reviewed by slebresne for CASSANDRA-6236
2014-03-20 18:23:53 +01:00
Mikhail Stepura a2ceb22c59 Python-driver without a hard dependency on `scales` 2014-03-13 11:07:09 -07:00
Mikhail Stepura caf609cf6f Switch cqlsh from cassandra-dbapi2 to python-driver
patch by Mikhail Stepura for CASSANDRA-6307; reviewed by Aleksey Yeschenko and Tyler Hobbs
2014-03-12 15:02:14 -07: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
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 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