Commit Graph

9383 Commits

Author SHA1 Message Date
Jérôme Mainaud e1393ec54f Unify STDOUT and SYSTEMLOG logback format
Patch by Jérôme Mainaud; Reviewed by Paulo Motta for CASSANDRA-12004
2016-07-27 15:38:32 +01:00
Sylvain Lebresne 472a7c55bc Merge branch 'cassandra-3.9' into trunk
* cassandra-3.9:
  AssertionError with MVs on updating a row that isn't indexed due to a null value
2016-07-27 11:29:56 +02:00
Sylvain Lebresne e9e6a0d4e8 Merge branch 'cassandra-3.0' into cassandra-3.9
* cassandra-3.0:
  AssertionError with MVs on updating a row that isn't indexed due to a null value
2016-07-27 11:28:17 +02:00
Sylvain Lebresne 8d020e25c0 AssertionError with MVs on updating a row that isn't indexed due to a null value
patch by Sylvain Lebresne; reviewed by Carl Yeksigian for CASSANDRA-12247
2016-07-27 11:26:10 +02:00
Hiroyuki Nishi a59689ad81 COPY FROM should raise error for non-existing input files
patch by Hiroyuki Nishi; reviewed by Stefania Alborghetti for CASSANDRA-12174
2016-07-27 12:27:44 +08:00
Dave Brosius 6ca39ea424 Merge branch 'cassandra-3.9' into trunk 2016-07-26 20:22:07 -04:00
Dave Brosius aa64e65e1e Merge branch 'cassandra-3.8' into cassandra-3.9
Conflicts:
	CHANGES.txt
2016-07-26 20:20:52 -04:00
T Jake Luciani dc9ed46341 Improve write path performance
Patch by tjake; reviewed by Stefania Alborghetti for CASSANDRA-12269
2016-07-26 14:55:54 -04:00
Carl Yeksigian accf7a4724 Merge branch 'cassandra-3.9' into trunk 2016-07-26 10:00:04 -04:00
Carl Yeksigian 67909ea84c Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-26 09:59:15 -04:00
Carl Yeksigian 6105da3f58 Disable RR and speculative retry with EACH_QUORUM reads
Patch by Carl Yeksigian; reviewed by Aleksey Yeschenko for CASSANDRA-11980
2016-07-26 09:58:06 -04:00
Carl Yeksigian d8ca69c01d Merge branch 'cassandra-3.9' into trunk 2016-07-26 08:59:12 -04:00
Carl Yeksigian 79fbdbe6c8 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-26 08:58:53 -04:00
Carl Yeksigian 0bb133e39d Add option to override compaction space check
Patch by Sankalp Kohli; reviewed by Carl Yeksigian for CASSANDRA-12180
2016-07-26 08:49:56 -04:00
Stefania Alborghetti 78a91dbe75 Merge branch 'cassandra-3.9' into trunk 2016-07-25 09:24:46 +08:00
Stefania Alborghetti 9501c64f6d Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-25 09:24:17 +08:00
Stefania Alborghetti 659be5f5e7 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-07-25 09:23:00 +08:00
Stefania Alborghetti b92ab60f72 cqlsh copyutil should get host metadata by connected address
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-11979
2016-07-25 09:21:15 +08:00
Stefania Alborghetti d588af1856 Merge branch 'cassandra-3.9' into trunk 2016-07-25 08:45:56 +08: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
Jonathan Ellis 286f6a1435 Remove compaction Severity from DynamicEndpointSnitch
patch by jbellis; reviewed by Jeremiah Jordan for CASSANDRA-11738
2016-07-22 17:24:22 -05:00
Jonathan Ellis bfa1acd311 update CHANGES 2016-07-21 10:19:47 -05:00
Jonathan Ellis ad1dcefe8e update CHANGES 2016-07-21 10:18:56 -05:00
Jonathan Ellis ba068472b3 Revert "Reduce contention getting instances of CompositeType"
This reverts commit fda3d8ee25.

(See thread at https://mail-archives.apache.org/mod_mbox/cassandra-dev/201607.mbox/%3CCALdd-zjg%2Ba73VncPkU2rw_UpFPVsw0yNwO-yBqUQfK8H8FpiKw%40mail.gmail.com%3E)
2016-07-21 10:17:31 -05:00
Jonathan Ellis e865e88753 Revert "Range tombstones that are masked by row tombstones should not be written out"
This reverts commit 98f5f77bb3.

(See thread at https://mail-archives.apache.org/mod_mbox/cassandra-dev/201607.mbox/%3CCALdd-zjg%2Ba73VncPkU2rw_UpFPVsw0yNwO-yBqUQfK8H8FpiKw%40mail.gmail.com%3E)
2016-07-21 10:15:41 -05:00
Aleksey Yeschenko e7dcbd64a8 Merge branch 'cassandra-3.9' into trunk 2016-07-21 15:03:55 +01:00
Aleksey Yeschenko 5e111e64d0 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-21 15:03:45 +01:00
Jeff Jirsa 864e009b08 Faster startup by only scanning each directory for temporary files once
patch by Jeff Jirsa; reviewed by Joel Knighton for CASSANDRA-12114
2016-07-21 15:01:28 +01:00
Tyler Hobbs 5d9aab2765 Merge branch 'cassandra-3.9' into trunk 2016-07-20 15:40:20 -05:00
Tyler Hobbs 7fbe42a5a0 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-20 15:40:11 -05:00
Tyler Hobbs 904137c384 Respond with pre-v3 header for unsupported low proto versions
Patch by Tyler Hobbs; reviewed by Sandeep Tamhankar for CASSANDRA-11464
2016-07-20 15:37:50 -05:00
Aleksey Yeschenko 058faff6f9 Merge branch 'cassandra-3.9' into trunk 2016-07-20 15:03:42 +01:00
Mike Adamson 0b49b1776e cqlsh: Fix handling of $$-escaped strings
patch by Mike Adamson; reviewed by Alex Petrov for CASSANDRA-12189
2016-07-20 15:02:41 +01:00
Sylvain Lebresne a6f5009f65 Merge branch 'cassandra-3.9' into trunk
* cassandra-3.9:
  NullPointerExpception when reading/compacting table
2016-07-20 14:29:28 +02:00
Sylvain Lebresne 43d726be95 Merge branch 'cassandra-3.0' into cassandra-3.9
* cassandra-3.0:
  NullPointerExpception when reading/compacting table
2016-07-20 14:29:16 +02:00
Sylvain Lebresne 979e5590e0 NullPointerExpception when reading/compacting table
patch by Sylvain Lebresne; reviewed by Carl Yeksigian for CASSANDRA-11988
2016-07-20 14:27:18 +02:00
Sam Tunnicliffe a41fb50750 Merge branch 'cassandra-3.9' into trunk 2016-07-20 13:06:25 +01:00
Sam Tunnicliffe 9eae8d340c Use custom RMI registry to avoid issues with JMX and SSL
Patch by Sam Tunnicliffe; reviewed by Jake Luciani for CASSANDRA-12109
2016-07-20 13:06:02 +01:00
Stefania Alborghetti f129dea869 Merge branch 'cassandra-3.9' into trunk 2016-07-20 10:00:12 +08:00
Stefania Alborghetti 8df6d4d4c6 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-20 09:58:40 +08:00
Stefania Alborghetti dce4537410 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-07-20 09:56:12 +08:00
Stefania Alborghetti e8186fe390 Fixed cqlshlib.test.remove_test_db
patch by Stefania Alborghetti; reviewed by Philip Thompson for CASSANDRA-12214
2016-07-20 09:54:53 +08:00
Sylvain Lebresne 12911352de Option to leave omitted columns in INSERT JSON unset
patch by Oded Peer; reviewed by Sylvain Lebresne for CASSANDRA-11424
2016-07-19 15:49:09 +02:00
Sylvain Lebresne d314b60576 Merge branch 'cassandra-3.9' into trunk
* cassandra-3.9:
  Fix problem with undeleteable rows on upgrade to new sstable format.
2016-07-19 12:04:33 +02:00
Sylvain Lebresne d4ced24535 Merge branch 'cassandra-3.0' into cassandra-3.9
* cassandra-3.0:
  Fix problem with undeleteable rows on upgrade to new sstable format.
2016-07-19 12:03:08 +02:00
Alex Petrov c481e8dc84 Fix problem with undeleteable rows on upgrade to new sstable format.
Patch by Alex Petrov; reviewed by Sylvain Lebresne for CASSANDRA-12144.
2016-07-19 11:57:09 +02:00
Aleksey Yeschenko 7b7ca79a68 Merge branch 'cassandra-3.9' into trunk 2016-07-18 16:50:45 +01:00