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

497 Commits

Author SHA1 Message Date
Robert Stupp 8f0d5a295d remove net.mintern.primitive library due to license issue, 
remove primitive-1.0.jar, add ASL2 licensed TimSort implementation, update snowball-stemmer license file

patch by Robert Stupp; reviewed by  for CASSANDRA-12845
 2016-10-27 11:42:05 +02:00
Benjamin Lerer af1afef564 Upgrade commons-codec to 1.9 
patch by Benjamin Lerer; reviewed by Aleksey Yeschenko  for CASSANDRA-12790
 2016-10-20 17:21:02 +02:00
Stefania Alborghetti a0419085d5 cqlsh fails to format collections when using aliases 
Patch by Stefania Alborghetti; reviewed by Robert Stupp for CASSANDRA-11534
 2016-10-13 09:26:16 +08:00
Michal Matloka e7fb0639db Upgrade metrics-reporter-config to 3.0.3 
Patch by Michał Matłoka; reviewed by tjake for CASSANDRA-12089
 2016-09-28 08:12:03 -04:00
nitsanw e73633cd81 Fix Cassandra Stress reporting thread model and precision 
Patch by Nitsan Wakart; reviewed by tjake for CASSANDRA-12585
 2016-09-07 10:14:20 -04:00
T Jake Luciani 143d16961a Merge branch 'cassandra-3.9' into trunk 2016-08-05 11:54:28 -04:00
T Jake Luciani aab33f1170 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-08-05 11:54:08 -04:00
T Jake Luciani 1cce9eb5b8 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-08-05 11:34:14 -04:00
Stefan Podkowinski 3cda6829cc Add JVM metrics for custom metrics reporter 
patch by Stefan Podkowinski; reviewed by tjake for CASSANDRA-12312
 2016-08-05 11:03:14 -04:00
Robert Stupp becd730ad3 Update OHC to v0.4.4 (failed to load Java8 implementation ohc-core-j8) 
patch by Robert Stupp; reviewed by T Jake Luciani for CASSANDRA-12133
 2016-08-02 10:50:24 +02:00
Stefania Alborghetti 7ca3e28cd5 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-25 08:45:04 +08:00
Stefania Alborghetti c3bf2f47b9 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-07-25 08:41:55 +08:00
Stefania Alborghetti 3a7cfbd19b Merge branch 'cassandra-2.1' into cassandra-2.2 2016-07-25 08:40:35 +08:00
Stefania Alborghetti 3d3359eb95 cannot use cql since upgrading python to 2.7.11+ 
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-11850
 2016-07-25 08:39:12 +08:00
T Jake Luciani 2aa76632d6 Netty 4.0.39-Final update post .37 fix 2016-07-18 10:53:22 -04:00
Stefania Alborghetti 78f077de07 Revert "Update to Netty 4.0.37" 
This reverts commit e8d7fe8a28.
 2016-07-06 12:58:06 +08:00
Dave Brosius db61372498 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-07-01 16:14:13 -04:00
Dave Brosius da20fece74 update license txt file version numbers 2016-07-01 16:08:35 -04:00
Dave Brosius bd6ad43b9c update license file versions 2016-07-01 15:53:29 -04:00
Robert Stupp e8d7fe8a28 Update to Netty 4.0.37 
patch by Robert Stupp; reviewed by T Jake Luciani for CASSANDRA-12032
 2016-06-21 16:47:37 +02:00
Dave Brosius ea1739f72e update logback license version 2016-06-19 00:18:22 -04:00
Stefania Alborghetti 06bb6b9d09 Updated cqlsh Python driver to fix DESCRIBE problem for legacy tables 
patch by Stefania Alborghetti; reviewed by Adam Holmberg for CASSANDRA-11055
 2016-06-02 14:06:33 +02:00
T Jake Luciani 5511802ace fix bad license file 2016-05-31 11:04:49 -04:00
nitsanw 89f275c658 Introduce HdrHistogram and response/service/wait separation to stress tool 
Patch by Nitsan Wakart; reviewed by tjake for CASSANDRA-11853
 2016-05-27 11:59:55 -04:00
T Jake Luciani 886f875714 Merge branch 'cassandra-3.0' into cassandra-3.7 2016-05-06 09:08:35 -04:00
T Jake Luciani 06870372d0 Update java driver 
patch by Andy Tolbert; reviewed by tjake for CASSANDRA-11615
 2016-05-06 09:04:31 -04:00
T Jake Luciani df5f22843b fix netty lisc version 2016-05-02 16:52:45 -04:00
Robert Stupp b57e6bd846 Merge branch 'cassandra-3.0' into trunk 2016-05-02 17:09:37 +02:00
Robert Stupp a1cc804f5d fix license for OHC (rename from 0.4.2 to 0.4.3) 2016-05-02 17:09:26 +02:00
Branimir Lambov 30bb255ec9 Add uncompressed chunk cache for RandomAccessReader 
patch by Branimir Lambov; reviewed by Pavel Yaskevich for CASSANDRA-5863
 2016-04-28 22:14:42 -07:00
T Jake Luciani a0d070764a upgrade netty to 4.0.36 
patch by tjake; reviewed by Jason Brown for CASSANDRA-11567
 2016-04-14 10:31:53 -04:00
Benjamin Lerer 43ff27fc70 Upgrade Netty to version 4.0.34 
patch by Benjamin Lerer; reviewed by Aleksey Yeschenko for CASSANDRA-11096
 2016-03-30 10:13:51 +02:00
Robert Stupp 9b1968fcb6 Merge branch 'cassandra-3.0' into cassandra-3.5 2016-03-30 09:00:41 +02:00
Robert Stupp 500d6b3a2c Upgrade ohc to 0.4.3 
patch by Robert Stupp; reviewed by Tyler Hobbs for CASSANDRA-11444
 2016-03-30 09:00:10 +02:00
Robert Stupp b51f9495e5 Merge branch 'cassandra-3.0' into trunk 2016-02-04 19:33:21 +01:00
Robert Stupp f34036265e Hadoop integration is incompatible with Cassandra Driver 3.0.0 
patch by Robert Stupp; reviewed by Jeremiah Jordan for CASSANDRA-11001
 2016-02-04 19:30:50 +01:00
Pavel Yaskevich 72790dc8e3 Integrate SASI index into Cassandra 
patch by xedin; reviewed by beobal for CASSANDRA-10661
 2016-01-23 19:35:29 -08:00
Aleksey Yeschenko d877ba073f Eliminate the dependency on jgrapht for UDT resolution 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-10653
 2015-12-18 15:39:33 +00:00
Stefania 803a3d9011 10753-3.0 patch 2015-12-01 13:56:03 -05:00
Stefania 1b81ad19d3 Fix completion problems in cqlsh 
Patch by stefania; reviewed by pmotta for CASSANDRA-10753
 2015-12-01 13:52:09 -05:00
Aleksey Yeschenko 39bc5de68a Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-06 18:39:42 +00:00
Aleksey Yeschenko cb429063c1 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-06 17:56:33 +00:00
Robert Stupp e94032a234 Store UDA initcond as CQL literal in the schema table, instead of a blob 
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-10650
 2015-11-06 18:28:48 +01:00
Aleksey Yeschenko 340df43fb7 Use CQL type names in schema metadata tables 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-10365
 2015-11-04 17:06:07 +00:00
Aleksey Yeschenko f4af154637 Remove redundant bundled python-driver 2015-11-04 16:31:50 +00:00
Aleksey Yeschenko 1d340befaf Revert "Revert "Update cqlsh driver for new driver execution API"" 
This reverts commit 0fbf715916.
 2015-11-04 14:36:05 +00:00
Aleksey Yeschenko 9404fed01a Revert "Revert "Update cqlsh driver for new driver execution API"" 
This reverts commit 0fbf715916.
 2015-11-04 14:21:18 +00:00
Sylvain Lebresne f27cc7ef3c Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-30 14:52:53 +01:00
Sylvain Lebresne 0fbf715916 Revert "Update cqlsh driver for new driver execution API" 
This reverts commit acf67d559c.
 2015-10-30 14:51:26 +01:00
Sylvain Lebresne 10ef01d1ca Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-30 10:02:15 +01:00
Paulo Motta acf67d559c Update cqlsh driver for new driver execution API 
patch by aholmber; reviewed by pauloricardomg for CASSANDRA-10513
 2015-10-30 09:54:03 +01:00
Robert Stupp 615945d275 Aggregate with Initial Condition fails with C* 3.0 
patch by Robert Stupp; reviewed by Sylvain Lebresne for CASSANDRA-10367
 2015-10-20 17:45:30 +02:00
T Jake Luciani be89dae3ec Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	CHANGES.txt
 2015-10-07 10:13:40 -04:00
Carl Yeksigian 1b08cbd817 Update python driver to 2.7.2 
Patch by carl; reviewed by tjake for CASSANDRA-10161
 2015-10-07 10:11:26 -04:00
Aleksey Yeschenko 6af4657a96 Update bundled drivers for CASSANDRA-9664 2015-09-19 16:30:02 +01:00
Paulo Motta e25453ba55 Moved crc_check_chance out of compression options 
Patch by Paulo Motta; reviewed by Sam Tunnicliffe for CASSANDRA-9839
 2015-09-19 11:38:55 +01:00
Sam Tunnicliffe 106b1cdabe Don't allow secondary indexes on materialized views 
This commit also fixes a problem with AlterViewStatement not updating
view options correctly.

Patch by Sam Tunnicliffe and Paulo Motta; reviewed by Aleksey Yeschenko
for CASSANDRA-9921
 2015-09-18 11:47:02 +01:00
Stefania Alborghetti aeee9f74d9 Add DESCRIBE MATERIALIZED VIEW to cqlsh 
patch by Stefania Alborghetti; reviewed by Benjamin Lerer for CASSANDRA-9961
 2015-09-18 11:33:54 +02:00
Aleksey Yeschenko 2db8370fdf Do not persist ReversedType in system_schema.columns 
patch by Aleksey Yeschenko; reviewed by Sam Tunnicliffe for
CASSANDRA-6717
 2015-09-17 18:24:00 +01:00
Sam Tunnicliffe fde97c3b3d Remove target_columns from index metadata 
Patch by Sam Tunnicliffe; reviewed by Sylvain Lebresne for
CASSANDRA-10216
 2015-09-16 17:25:23 +01:00
Carl Yeksigian a3a8dbca5c Improve MV schema representation 
patch by Carl Yeksigian; reviewed by Aleksey Yeschenko for
CASSANDRA-9921
 2015-09-16 15:34:18 +01:00
Aleksey Yeschenko 0790e48191 Modernize system_schema columns and triggers tables 
Patch by Aleksey Yeschenko; reviewed by Sam Tunnicliffe for
CASSANDRA-6717
 2015-09-11 18:03:12 +01:00
Stefania Alborghetti ce63ccc842 Faster sequential IO (CASSANDRA-8630) 
Merge RandomAccessReader and NIODataInputStream class hierarchies
to share performance optimisation work across all readers.

patch by stefania; reviewed by ariel and benedict for CASSANDRA-8630
 2015-09-04 12:42:35 +01:00
Sam Tunnicliffe 07dfc208a4 Update bundled python driver to fix problem with missing blist dependency 2015-08-28 13:07:11 +01:00
Blake Eggleston 51bc7f87d7 Fix post-6717 driver issue with indexes 
patch by Blake Eggleston; reviewed by Aleksey Yeschenko for
CASSANDRA-10121
 2015-08-19 22:17:05 +03: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
Adam Holmberg e58b7df935 Fix cqlsh DESCRIBE column order 
patch by Adam Holmberg; reviewed by Aleksey Yeschenko for CASSANDRA-9968
 2015-08-04 16:39:51 +03:00
Robert Stupp 1774eb9a86 Bytecode inspection for Java-UDFs 
patch by Robert Stupp; reviewed by T Jake Luciani for CASSANDRA-9890
 2015-07-31 20:36:23 +02:00
Aleksey Yeschenko 7b35e3e843 Update the bundled java driver to fix failing pig tests 
patch by Aleksey Yeschenko for CASSANDRA-9841
 2015-07-23 22:00:17 +03:00
Aleksey Yeschenko dc8523819f Modernize system_schema.tables table 
patch by Aleksey Yeschenko; reviewed by Tyler Hobbs and Robert Stupp for
CASSANDRA-6717
 2015-07-18 00:14:08 +03:00
Ariel Weisberg 177e0dcbe4 For CASSANDRA-9499, update to OHC 0.4 that allow deserialization directly from ByteBuffers 2015-07-15 14:24:35 +01:00
Aleksey Yeschenko 7d6c876ec9 Move schema tables to the new system_schema keyspace 
patch by Aleksey Yeschenko; reviewed by Tyler Hobbs for CASSANDRA-6717
 2015-07-10 15:28:37 +03:00
T Jake Luciani 8c22b4a81f Remove crc and adler reflection hacks 
patch by tjake; reviewed by benedict for CASSANDRA-9650
 2015-07-09 11:31:31 -04:00
Jeremiah Jordan 43c27e99f7 Update Guava to 18.0 
patch by Jeremiah Jordan; reviewed by Aleksey Yeschenko for
CASSANDRA-9653
 2015-07-07 02:41:57 +03:00
T Jake Luciani c5c9739392 Merge branch 'cassandra-2.2' into trunk 2015-07-06 12:26:32 -04:00
T Jake Luciani ff74eaf0e0 Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	CHANGES.txt
 2015-07-06 12:26:01 -04:00
Tyler Hobbs db39257c34 cqlsh: Fix bad DESCRIBE CQL-compat check on COMPACT tables 
Patch by Tyler Hobbs; reviewed by tjake for CASSANDRA-9647
 2015-07-06 12:22:04 -04:00
Aleksey Yeschenko 9627f13ef7 Delete lib/super-csv-2.1.0.jar (follow up to CASSANDRA-9035) 2015-07-01 20:13:49 +03:00
Stefania Alborghetti e89d54865e Change hinted_handoff_enabled yaml setting, JMX 
patch by Stefania Alborghetti; reviewed by Aleksey Yeschenko for
CASSANDRA-9035
 2015-07-01 19:43:33 +03:00
T Jake Luciani 1e237d5a88 Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	CHANGES.txt
 2015-06-30 09:28:02 -04:00
blerer c65d81bfae Update internal python driver for cqlsh 
patch by Benjamin Lerer; reviewed by tjake for CASSANDRA-9064
 2015-06-30 09:25:10 -04:00
Stefania Alborghetti 5d9729bc9b Added support for DESCRIBE INDEX and DESCRIBE <objectname> 
Patch by Stefania Alborghetti; reviewed by Benjamin Lerer for CASSANDRA-7814
 2015-06-26 08:18:15 +02:00
Robert Stupp c889bab221 ninja fix cqlsh's python driver 2015-06-23 21:59:16 +02:00
Robert Stupp cfab9dac19 Update cqlsh for UDFs 
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-7556
 2015-06-23 19:19:57 +02:00
Robert Stupp a13399279b Rename class for DATE type in Java driver 
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-9563
 2015-06-18 18:02:45 +02:00
Yuki Morishita 514dcd944c Add logback metrics 
patch by yukim; reviewed by Jeremiah Jordan for CASSANDRA-9378
 2015-06-16 17:39:00 -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
Stefania Alborghetti 33d71b825f (cqlsh) Add support for native protocol 4 
patch by Stefania Alborghetti; reviewed by Aleksey Yeschenko for
CASSANDRA-9399
 2015-05-22 00:47:27 +03:00
Robert Stupp 0282cd550c Use ecj instead of javassist for UDFs 
patch by Robert Stupp; reviewed by Carl Yeksigian for CASSANDRA-8241
 2015-05-15 17:28:21 +02:00
Ariel Weisberg 160e7f2945 faster async logback configuration for tests 
patch by awiesberg; reviewed by beobal for CASSANDRA-9376
 2015-05-15 11:20:35 -04:00
T Jake Luciani a2c05e2e3e Upgrade Snappy library 
Patch by tjake; reviewed by thobbs for (CASSANDRA-9063)
 2015-05-12 14:12:27 -04:00
Philip Thompson f698cc2284 Remove Thrift dependencies in bundled tools 
patch by Philip Thompson; reviewed by Aleksey Yeschenko for
CASSANDRA-8358
 2015-05-05 23:57:39 +03:00
Tyler Hobbs 5b61545315 Merge branch 'cassandra-2.1' into trunk 2015-05-05 14:46:06 -05:00
Tyler Hobbs 22527730d3 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-05-05 14:45:40 -05:00
Carl Yeksigian afe541a482 cqlsh: Add (LOCAL_)SERIAL consistency levels 
Patch by Carl Yeksigian; reviewed by Stefania Alborghetti for
CASSANDRA-8051
 2015-05-05 14:43:56 -05:00
Dave Brosius 792446a5a9 o.a.c.u.NoSpamLoggerTest uses slf4j's SubstituteLogger, which doesn't exist in 1.7.2 
upgrade slf4j to 1.7.7 which has it.
 2015-04-23 00:48:41 -04:00
Joshua McKenzie 7f29201ce2 Revert "Add date and time types" on 2.1 branch 
This reverts commit 107545b392.

Conflicts:
	CHANGES.txt
	NEWS.txt
	bin/cqlsh
	pylib/cqlshlib/test/test_keyspace_init.cql
 2015-04-21 08:42:31 -05:00
Dave Brosius cbb982cc17 Merge branch 'cassandra-2.1' into trunk 2015-04-08 23:38:38 -04:00
Dave Brosius 7b83334f30 cassandra-7028 upgraded to antlr-3.5.2 and pulled in a hard org.antlr#stringtemplate dependency. 
But antlr recursively pulls in an org.antlr#ST4 jar which is a complete duplicate of stringtemplate.
So stringtemplate.jar and ST4.jar provide duplicate sets of package/classes, which could cause problems.
Switch to only use ST4, as the normal recursive dependency brings in.
 2015-04-08 23:12:37 -04:00
Tyler Hobbs addba6b56f Merge branch 'cassandra-2.1' into trunk 2015-04-01 13:04:17 -05:00
Blake Eggleston 2fa18d3a9f Upgraded bundled python driver to 2.5.0 
Patch by Blake Eggleston; reviewed by Tyler Hobbs for CASSANDRA-9081 and
CASSANDRA-8919
 2015-04-01 13:03:20 -05:00
T Jake Luciani a672097db4 bump metrics-reporter-config dependency 
patch by tjake; reviewed by cburroughs for CASSANDRA-8149
 2015-03-23 13:44:30 -04:00
Joshua McKenzie 3d11ec5dd3 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	pylib/cqlshlib/cql3handling.py
 2015-03-09 12:26:24 -05:00
Joshua McKenzie 107545b392 Add date and time types 
Patch by jmckenzie; reviewed by thobbs and cyeksigian for CASSANDRA-7523
 2015-03-09 12:20:28 -05:00
T Jake Luciani 66a5d3bbe4 Make CRC32Ex into a separate maven dependency 
Patch by tjake; reviewed by aweisberg for CASSANDRA-8836
 2015-03-09 10:10:53 -04:00
Robert Stupp 0d2ec11c7e use preloaded jemalloc w/ Unsafe 
Patch by Robert Stupp; Reviewed by Ariel Weisberg for CASSANDRA-8714
 2015-03-05 10:57:03 +01:00
Tyler Hobbs 0af528b942 Merge branch 'cassandra-2.1' into trunk 2015-02-10 12:56:35 -06:00
Tyler Hobbs f5380de5e0 Upgrade bundled python driver to 077b876fdd38 
Patch by Tyler Hobbs for CASSANDRA-8154
 2015-02-10 12:55:01 -06:00
Robert Stupp 97d7d139f2 row cache: remove annoying classpath from "jemalloc not found" message 
Patch by Robert Stupp; Reviewed by Aleksey Yeschenko
 2015-01-31 18:47:02 +01:00
T Jake Luciani 0b324c5e55 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	build.xml
 2015-01-30 12:02:42 -05:00
T Jake Luciani cdcf6461a3 Upgrade thrift to 0.9.2 
Patch by tjake; reviewed by Philip Thompson for CASSANDRA-8685
 2015-01-30 09:46:02 -05:00
T Jake Luciani 8896a70b01 Upgrade metrics library and remove depricated metrics 
Patch by tjake; reviewed by aleksey for CASSANDRA-5657
 2015-01-28 11:12:19 -05:00
Dave Brosius d4b23b0598 remove use of commons-logging in favor of jcl-over-slf4j 2015-01-22 21:40:32 -05:00
Dave Brosius b5721b5120 fix ohc license version 2015-01-21 22:07:56 -05:00
Tyler Hobbs 0c3720ab80 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	CHANGES.txt
 2015-01-21 18:31:40 -06:00
Tyler Hobbs 7dc94abd57 Upgrade bundled python driver to badad6d40 
Patch by Tyler Hobbs for CASSANDRA-8563 and CASSANDRA-8372
 2015-01-21 18:30:44 -06:00
Robert Stupp dfd78d0e90 Serializing Row cache alternative, fully off heap 
Patch by Robert Stupp, reviewed by Ariel Weisberg for CASSANDRA-7438
 2015-01-21 20:50:35 +01:00
T Jake Luciani 3dd9c38a14 DirectByteBuffer compatible LZ4 methods 
Patch by Branimir Lambov; reviewed by tjake for CASSANDRA-7039
 2015-01-16 09:34:13 -05:00
Tyler Hobbs a10a2ba815 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	lib/cassandra-driver-internal-only-2.1.2.post.zip
 2014-12-18 12:38:47 -06:00
Tyler Hobbs d2583ce879 Upgrade bundled python driver to 2.1.3 
Patch by Tyler Hobbs. Fixes CASSANDRA-7623, and CASSANDRA-8288, CASSANDRA-8326
 2014-12-18 12:36:46 -06:00
Robert Stupp e13121318b Validate functionality of different JSR-223 providers in UDFs. 
patch by Robert Stupp; reviewed by Mikhail Stepura for CASSANDRA-7874
 2014-11-26 12:51:37 -08:00
Sylvain Lebresne 528cc3dd19 Merge branch 'cassandra-2.1' into trunk 2014-11-24 10:33:32 +01:00
Sylvain Lebresne 6ae1b420a6 Better jamm 0.3.0 jar 2014-11-24 10:32:46 +01:00
Tyler Hobbs f02d19451a Add missing jamm jar from CASSANDRA-8231 commit 2014-11-21 15:42:49 -06:00
Tyler Hobbs 699a69de8d Merge branch 'cassandra-2.1' into trunk 2014-11-21 15:40:53 -06:00
blerer 1bb2dd906c Fix size calculations for prepared statements 
Patch by Benjamin Lerer; reviewed by Dave Brosius for CASSANDRA-8231
 2014-11-21 14:54:47 -06:00
Tyler Hobbs 3cc9a0c87f Temporary fix for CASSANDRA-8326 
This is a temporary python driver fix for CASSANDRA-8326.  The patch
has not been properly reviewed and tested by the python driver team.
The driver version bundled here can be found at the following branch:

https://github.com/thobbs/python-driver/tree/CASSANDRA-8326-temp-fix
 2014-11-18 15:36:47 -06:00
Dave Brosius d286ac7d07 fix license extension 2014-11-09 00:38:09 -05:00
Dave Brosius c832a36f25 route sigar's use of log4j thru slf4j 2014-11-08 23:12:04 -05:00
Jake Luciani 4fd3349e2e Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	build.xml
 2014-11-05 15:44:03 -05:00
Jake Luciani 4f863be3f7 Fix Cassandra crash when running on JDK8 update 40 
Patch by Michael Schuler; reviewed by Robert Stupp (CASSANDRA-8209)
 2014-11-05 15:28:24 -05:00
Tyler Hobbs 7c595cb809 Merge branch 'cassandra-2.1' into trunk 2014-10-29 18:45:14 -05:00
Tyler Hobbs 391f1d3bb6 cqlsh: upgrade bundled python driver to 2.1.2 
Patch by Tyler Hobbs for CASSANDRA-8031
 2014-10-29 18:42:06 -05:00
Robert Stupp b94c87a181 Update java driver to 2.1.2 
patch by snazy; reviewed by slebresne for CASSANDRA-7692
 2014-10-14 09:49:25 +02:00
Joshua McKenzie 861c4cf2de Integrate Sigar library and add basic OS performance checks on startup 
Patch by Amit Kumar and Josh McKenzie; reviewed by tjake for (CASSANDRA-7838)
 2014-10-09 12:32:57 -04:00
Jake Luciani a848b08ceb Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	NEWS.txt
	src/java/org/apache/cassandra/transport/Server.java
 2014-10-08 16:34:35 -04:00
Jake Luciani dacddd2668 Upgrade netty to 4.0.23 enable epoll 
Patch by tjake; reviewed by Jason Brown for CASSANDRA-7761
 2014-10-08 16:12:30 -04:00
Dave Brosius 2279d49e96 Allow cassandra to compile under java 8 
patch by dbrosius reviewed by jmckenzie for cassandra-7028
 2014-10-02 12:47:08 -05:00
Tyler Hobbs 56b7737936 Merge branch 'cassandra-2.1' into trunk 2014-10-01 12:30:09 -05:00
Tyler Hobbs 592672320d cqlsh: Fix IPv6 Support 
This commit upgrades the bundled datastax/python-driver to
ad2f61f8655.

Patch by Tyler Hobbs; reviewed by Philip Thompson for CASSANDRA-7988
 2014-10-01 12:27:39 -05:00
Aleksey Yeschenko 380273826d Remove cassandra-cli 
patch by Aleksey Yeschenko; reviewed by Brandon Williams and Jason Brown
for CASSANDRA-7920
 2014-09-24 18:33:29 -07:00
Dave Brosius 995904c2dd update thrift-server license file 2014-09-05 22:09:46 -04:00
Jason Brown 916efcb6fb Merge branch 'cassandra-2.1' into trunk 2014-09-05 16:48:17 -07:00
Jason Brown 8d69214197 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	build.xml
 2014-09-05 16:45:20 -07:00
Pavel Yaskevich e6f307f4e5 bump thrift-server version to 0.3.7 to properly shutdown invocation pool shutdown 
patch by Pavel Yaskevich; tested by Philip Thompson for CASSANDRA-7594
 2014-09-05 14:23:24 -07:00
Tyler Hobbs 0229323382 Merge branch 'cassandra-2.1' into trunk 2014-09-05 11:10:56 -05:00
Tyler Hobbs 037963c62f Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-09-05 11:10:31 -05:00
Tyler Hobbs c1dc378e0a Add cqlsh DESCRIBE support for frozen UDTs, tuples 
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-7863
 2014-09-05 11:09:59 -05:00
Dave Brosius 9b98fecc69 update thrift-server license to 0.3.6 2014-09-03 23:43:03 -04:00
Dave Brosius 65db2c7438 add license for javassist 2014-09-03 21:01:11 -04:00