Commit Graph

387 Commits

Author SHA1 Message Date
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