Commit Graph

17813 Commits

Author SHA1 Message Date
Marcus Eriksson c08aaf69b4 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-02-09 07:14:00 +01:00
Marcus Eriksson 725b9b1f7f fix CHANGES.txt after 2.1.13 release 2016-02-09 07:09:54 +01:00
Marcus Eriksson b8408f068b Make it clear what timestamp_resolution is used for
Patch by marcuse; reviewed by Jeff Jirsa for CASSANDRA-11041
2016-02-09 07:08:22 +01:00
Aleksey Yeschenko 029b22e84d Merge branch 'cassandra-2.1' into cassandra-2.2 2016-02-08 15:52:07 +00:00
Ariel Weisberg 6fe70c6529 Gossiper#isEnabled is not thread safe
patch by aweisberg; reviewed by jasobrown for CASSANDRA-11116
2016-02-08 15:50:59 +00:00
Paulo Motta d295c7c698 (cqlsh) Support utf-8/cp65001 encoding on Windows
patch by Paulo Motta; reviewed by Stefania Alborghetti for CASSANDRA-11030
2016-02-08 12:16:23 +00:00
Marcus Eriksson 6982aaad85 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-02-08 08:55:10 +01:00
Blake Eggleston dd23adf141 Avoid mixing repaired and unrepaired sstables in DTCS
Patch by Blake Eggleston; reviewed by marcuse for CASSANDRA-11113
2016-02-08 08:49:37 +01:00
Tyler Hobbs 66229705d7 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-02-05 16:34:25 -06:00
Tyler Hobbs 26aa19e583 Add entries for all options to cqlsh.sample
Patch by Tyler Hobbs; reviewed by Lorina Poland for CASSANDRA-10622
2016-02-05 16:33:19 -06:00
Ariel Weisberg e4fb1deff7 Gossiper#isEnabled is not thread safe
patch by aweisberg; reviewed by jasobrown for CASSANDRA-11116
2016-02-05 13:59:38 -08:00
Tyler Hobbs 1168ddfff5 Fix 6706 ticket number in CHANGES.txt 2016-02-04 12:34:41 -06:00
Sylvain Lebresne 577accd879 Remove unecessary override 2016-02-03 14:24:33 +01:00
Sylvain Lebresne 3ec7d8c056 Add comment on DateType explaining that its kept only for backward compatibility 2016-02-03 12:08:13 +01:00
Sylvain Lebresne af2b858429 Merge commit '165f586e6f5e7e5d08f0b85e5b00dbe1f68e3e8f' into cassandra-2.2 2016-02-02 14:58:33 +01:00
Stefania Alborghetti 165f586e6f test_bulk_round_trip_blogposts is failing occasionally
Patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-10938
2016-02-02 14:51:19 +01:00
Marcus Eriksson c1ae9d095c Merge branch 'cassandra-2.1' into cassandra-2.2 2016-01-29 08:13:33 +01:00
Marcus Eriksson 3b794f0a82 Backport CASSANDRA-10979 to 2.1 2016-01-29 08:13:20 +01:00
Benjamin Lerer fa2fa602d9 Fix paging on DISTINCT queries repeats result when first row in partition changes
patch by Benjamin Lerer; reviewed by Sylvain Lebresne for CASSANDRA-10010
2016-01-27 17:21:22 +01:00
T Jake Luciani dd76858c76 2.2.5 build 2016-01-26 09:16:43 -05:00
T Jake Luciani 2e4a8490c4 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-01-26 09:13:37 -05:00
T Jake Luciani d5b6d1b634 2.1.13 build 2016-01-26 09:12:48 -05:00
Stefania Alborghetti b5d6d4f722 maxPurgeableTimestamp needs to check memtables too
Patch by Stefania Alborghetti; reviewed by marcuse for CASSANDRA-9949
2016-01-25 13:30:05 +08:00
Tyler Hobbs b4d67c9e5d Bump 2.2 version to 2.2.5 in build.xml 2016-01-22 12:00:32 -06:00
Yuki Morishita 3b244a3d14 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-01-22 11:43:27 -06:00
Yuki Morishita 8408c76aff Fix isJoined return true only after becoming cluster member
patch by yukim; reviewed by tjake for CASANDRA-11007
2016-01-22 10:46:43 -06:00
Soumava Ghosh dd2006b0c1 Make changes to compaction throughput be applied in real time
patch by soumava; reviewed by kohlisankalp for CASSANDRA-10025
2016-01-22 16:19:50 +01:00
Matthieu Nantern 3aaae7aa59 (cqlsh) encode input correctly when saving history
patch by matthieu.nantern; reviewed by pauloricardomg for CASSANDRA-10948
2016-01-22 16:03:20 +01:00
Benjamin Lerer deafdbe373 Avoid potential NPE for queries with ORDER BY and IN
patch by blerer; reviewed by beobal for CASSANDRA-10955
2016-01-22 15:49:36 +01:00
Sylvain Lebresne 0b479a7f3e Merge commit '3c55732fa414c7835536dc42ff489461a7441bfe' into cassandra-2.2 2016-01-22 15:43:56 +01:00
Joel Knighton 3c55732fa4 Measure max generation drift against local time instead of previously stored generation for remote host to allow long-running clusters.
patch by jkni; reviewed by Stefania for CASSANDRA-10969
2016-01-22 15:37:19 +01:00
Sylvain Lebresne 7bab8240e6 Don't query more results than necessary when paging range queries
patch by slebresne; reviewed by blerer for CASSANDRA-8521
2016-01-22 15:32:25 +01:00
Carl Yeksigian 38dde32ef4 Run STCS in L0 even when the higher levels do not produce a candidate
Patch by Carl Yeksigian; reviewed by marcuse for CASSANDRA-10979
2016-01-22 07:23:24 +01:00
Marcus Eriksson 968b1340a5 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-01-21 09:03:50 +01:00
Marcus Eriksson 98cc2c8d6c Avoid NPE on incremental repair failure
Patch by marcuse; reviewed by Carl Yeksigian for CASSANDRA-10909
2016-01-21 08:59:47 +01:00
Marcus Eriksson e66dcc70c5 Backport fix from CASSANDRA-10806 (CASSANDRA-10935) 2016-01-20 10:27:26 +01:00
Marcus Eriksson 476b68a3d7 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-01-19 09:04:30 +01:00
Marcus Eriksson 1b02a6eb40 Unmark sstables compacting once they are done in cleanup/scrub/upgradesstables.
Patch by marcuse; reviewed by Carl Yeksigian for CASSANDRA-10829
2016-01-19 08:58:45 +01:00
Sylvain Lebresne 47e8ef9e9c Make UUID LSB unique per-process
patch by slebresne; reviewed by benedict for CASSANDRA-7925
2016-01-18 15:24:50 +01:00
Sylvain Lebresne 79b9492363 Add warning regarding quoted identifiers in CQL doc 2016-01-18 11:27:24 +01:00
Yuki Morishita 1b59357360 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-01-15 12:10:05 -06:00
Paulo Motta 58a0079c39 Revert CASSANDRA-10012 and add more loggings
patch by Paulo Motta; reviewed by yukim for CASSANDRA-10961
2016-01-15 12:09:56 -06:00
T Jake Luciani e2050c9714 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-01-15 09:44:26 -05:00
T Jake Luciani abe0c6779c Allow simultaneous bootstrapping with strict consistency when no vnodes are used
patch by Sankalp Kohli; reviewed by tjake for CASSANDRA-11005
2016-01-15 09:31:22 -05:00
Marcus Eriksson ee1c145a64 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-01-15 09:31:00 +01:00
Marcus Eriksson 03e6f45087 Log a message when a major compaction results in more than one sstable
Patch by marcuse; reviewed by Sylvain Lebresne for CASSANDRA-10847
2016-01-15 09:22:30 +01:00
Aleksey Yeschenko e253bfee13 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-01-14 17:12:09 +00:00
Stefania Alborghetti c42716f2a9 (cqlsh) fix cqlsh_copy_tests when vnodes are disabled
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-10997
2016-01-14 17:09:40 +00:00
Yuki Morishita 101cd72e55 Avoid NPE when performing sstable tasks (scrub etc)
patch by yukim; reviewed by marcuse for CASSANDRA-10980
2016-01-14 09:56:59 -06:00
Aleksey Yeschenko 97474ee36a Merge branch 'cassandra-2.1' into cassandra-2.2 2016-01-14 15:49:16 +00:00