Commit Graph

21803 Commits

Author SHA1 Message Date
Jeff Jirsa 6839a579fa Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-03 13:04:11 -07:00
Yuki Morishita cf5cd158e9 Fix DatabaseDescriptorRefTest
patch by yukim; reviewed by Alex Petrov for CASSANDRA-12677
2016-09-30 09:57:37 -05:00
Jeff Jirsa 02404115e0 Revert "Merge branch 'cassandra-3.0' into trunk"
This reverts commit d45f323eb9, reversing
changes made to b80ef9b258.
2016-09-29 20:00:41 -07:00
Jeff Jirsa cd8a98a2dd Revert "Reject invalid DC names as option while creating or altering NetworkTopologyStrategy"
This reverts commit f2c5ad7439.
2016-09-29 19:50:04 -07:00
Yuki Morishita e3b34dc858 Merge branch 'cassandra-3.0' into cassandra-3.X 2016-09-29 15:05:12 -05:00
Yuki Morishita 413e48e657 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-09-29 14:32:49 -05:00
Paulo Motta c70ce6307d Fix merkle tree depth calculation
Patch by Paulo Motta; Reviewed by Yuki Morishita for CASSANDRA-12580
2016-09-29 14:26:53 -05:00
Sylvain Lebresne 57e9a83b2a cdc column addition still breaks schema migration tasks
patch by Sylvain Lebresne; reviewed by Aleksey Yeschenko for CASSANDRA-12697
2016-09-29 17:00:07 +02:00
Stefania Alborghetti 25d4c7baa5 Merge branch 'cassandra-3.0' into trunk 2016-09-29 09:29:05 +08:00
Stefania Alborghetti 5cebd1fb0d Fix failure in LogTransactionTest
Patch by Stefania Alborghetti; reviewed by Edward Capriolo for CASSANDRA-12632
2016-09-29 09:27:18 +08:00
Nate McCall 3a79a027c7 Really fix CM.setConcurrentCompactors, include test coverage for such
Fixes 979af884 and b80ef9b25 for CASSANDRA-12248
2016-09-29 12:52:24 +13:00
Michael Shuler 5e59b238fb Merge branch 'cassandra-3.0' into trunk 2016-09-28 13:11:21 -05:00
Michael Shuler 9dd805d0dc Merge branch 'cassandra-2.2' into cassandra-3.0 2016-09-28 13:10:44 -05:00
Michael Shuler 238393520c Bump base.version to 2.2.9 2016-09-28 13:10:06 -05: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
Jon Haddad c7f6ba8a42 fixed typos in set example as well as UDT example 2016-09-27 22:50:09 -07:00
Jeff Jirsa d45f323eb9 Merge branch 'cassandra-3.0' into trunk 2016-09-27 18:26:17 -07:00
Nachiket Patil f2c5ad7439 Reject invalid DC names as option while creating or altering NetworkTopologyStrategy 2016-09-27 18:16:26 -07:00
Nate McCall b80ef9b258 Ninja fix for invocation order of core and max pool size.
Fixes 979af884 for CASSANDRA-12248
2016-09-28 12:51:51 +13:00
Tyler Hobbs 12f5ca36ff Merge branch 'cassandra-3.0' into trunk 2016-09-27 12:04:35 -05:00
Tyler Hobbs 21d8a7d3bd Fix time-order query check for non-frozen UDTs, frozen collections
Patch by Tyler Hobbs; reviewed by Benjamin Lerer for CASSANDRA-12605
2016-09-27 11:59:53 -05:00
Tyler Hobbs 5692c59d14 Merge branch 'cassandra-3.0' into trunk 2016-09-27 11:53:45 -05:00
Tyler Hobbs 8aa6f29ce6 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-09-27 11:52:49 -05:00
Tyler Hobbs 738a57992c Merge branch 'cassandra-2.1' into cassandra-2.2 2016-09-27 11:52:31 -05:00
Tyler Hobbs cdd535fcac Treat IN values as a set instead of a list
Patch by Tyler Hobbs; reviewed by Benjamin Lerer for CASSANDRA-12420
2016-09-27 11:51:41 -05:00
Benjamin Lerer 7bef41856f Merge branch cassandra-3.0 into trunk 2016-09-27 14:13:22 +02:00
Benjamin Lerer b7fc5dc1c7 Merge branch cassandra-2.2 into cassandra-3.0 2016-09-27 14:08:50 +02:00
Benjamin Lerer 6dc595dd2e Make Collections deserialization more robust
patch by Benjamin Lerer; reviewed by Alex Petrov for CASSANDRA-12618
2016-09-27 14:02:10 +02:00
Marcus Eriksson 5777013368 Merge branch 'cassandra-3.0' into trunk 2016-09-27 09:13:49 +02:00
sharvanath b7da0031fa Make sure repaired tombstones are dropped when only_purge_repaired_tombstones is enabled
Patch by Sharvanath Pathak; reviewed by marcuse for CASSANDRA-12703
2016-09-27 09:09:29 +02:00
Dikang Gu 979af884ee Add command to get/set the number of concurrent compactors
Patch by Dikang Gu; reviewed by Nate McCall for CASSANDRA-12248
2016-09-27 14:10:40 +13:00
Michael Shuler 43ad488a55 Merge branch 'cassandra-3.9' into trunk 2016-09-26 09:08:59 -05:00
Michael Shuler 6baae9c0c2 Update d/changelog dates and set UNRELEASED on 3.10 2016-09-26 09:08:47 -05:00
Michael Shuler c1fa214587 Merge branch 'cassandra-3.8' into cassandra-3.9 2016-09-26 09:02:27 -05:00
Michael Shuler d51f4a5e85 Update d/changelog for 3.9 release 2016-09-26 08:59:34 -05:00
Michael Shuler ce609d19fd Set versions for 3.8 release 2016-09-26 08:53:44 -05:00
Alex Petrov cfa90c065f Add +=/-= shortcut syntax for update queries
patch by Alex Petrov; reviewed by Benjamin Lerer for CASSANDRA-12232
2016-09-26 11:48:13 +02:00
Michael Shuler bddfd643b0 Merge branch 'cassandra-3.0' into trunk 2016-09-23 16:44:23 -05:00
Michael Shuler 405a828c1f Merge branch 'cassandra-2.2' into cassandra-3.0 2016-09-23 16:43:29 -05:00
Michael Shuler e9fe96f404 Bump base.version and d/changelog to 2.2.8 2016-09-23 16:42:46 -05:00
Chris Lohfink c92928bb9c Include session IDs in repair start message
Patch by Chris Lohfink; reviewed by Tyler Hobbs for CASSANDRA-12532
2016-09-22 14:11:30 -05:00
Edward Capriolo f92f959eb3 CASSANDRA-12688 strongly suggest leaving -ea on 2016-09-22 10:39:47 -07:00
Aleksey Yeschenko 703506c3c7 Merge branch 'cassandra-3.0' into trunk 2016-09-21 18:15:48 -07:00
Aleksey Yeschenko 82d1600d78 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-09-21 18:14:49 -07:00
Joel Knighton df819ec833 Fix exceptions when enabling gossip on nodes that haven't joined the ring
Patch by Dikang Gu; reviewed by Joel Knighton for CASSANDRA-12253
2016-09-21 18:13:28 -07:00
Stefania Alborghetti 81fd9c6c2b Merge branch 'cassandra-3.0' into trunk 2016-09-22 09:01:52 +08:00
Stefania Alborghetti 47b50b4557 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-09-22 08:58:52 +08:00
Adam Holmberg 50726e7780 Fix authentication problem when invoking clqsh copy from a SOURCE command
Patch by Adam Holmberg; reviewed by Stefania Alborghetti for CASSANDRA-12642
2016-09-22 08:57:47 +08:00
Aleksey Yeschenko 91180ed64a Merge branch 'cassandra-3.0' into trunk 2016-09-21 16:33:41 -07:00
Paulo Motta 88d47911dd Skip writing MV mutations to commitlog on mutation.applyUnsafe()
Patch by Paulo Motta; Reviewed by Carl Yeksigian for CASSANDRA-11670
2016-09-21 16:31:42 -07:00