cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [10/14] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Tue, 09 Feb 2016 06:20:49 GMT
Merge branch 'cassandra-2.1' into cassandra-2.2


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c08aaf69
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c08aaf69
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c08aaf69

Branch: refs/heads/cassandra-2.2
Commit: c08aaf69b4bb62e2fe50342dfaa329dfd833ee1e
Parents: 029b22e 725b9b1
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Tue Feb 9 07:14:00 2016 +0100
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Tue Feb 9 07:14:00 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                                    | 3 ++-
 doc/cql3/CQL.textile                                           | 2 +-
 pylib/cqlshlib/cql3handling.py                                 | 1 -
 .../db/compaction/DateTieredCompactionStrategyOptions.java     | 6 ++++++
 4 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c08aaf69/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 770c394,72b3d59..fdd1122
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,41 -1,11 +1,42 @@@
 -2.1.14
 - * Make it clear what DTCS timestamp_resolution is used for (CASSANDRA-11041)
 +2.2.6
 + * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
 + * Fix paging on DISTINCT queries repeats result when first row in partition changes (CASSANDRA-10010)
 +Merged from 2.1:
   * Gossiper#isEnabled is not thread safe (CASSANDRA-11116)
   * Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-11113)
++ * Make it clear what DTCS timestamp_resolution is used for (CASSANDRA-11041)
+  * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938)
  
  
 -2.1.13
 +2.2.5
 + * maxPurgeableTimestamp needs to check memtables too (CASSANDRA-9949)
 + * Apply change to compaction throughput in real time (CASSANDRA-10025)
 + * Fix potential NPE on ORDER BY queries with IN (CASSANDRA-10955)
 + * Avoid over-fetching during the page of range queries (CASSANDRA-8521)
 + * Start L0 STCS-compactions even if there is a L0 -> L1 compaction
 +   going (CASSANDRA-10979)
 + * Make UUID LSB unique per process (CASSANDRA-7925)
 + * Avoid NPE when performing sstable tasks (scrub etc.) (CASSANDRA-10980)
 + * Make sure client gets tombstone overwhelmed warning (CASSANDRA-9465)
 + * Fix error streaming section more than 2GB (CASSANDRA-10961)
 + * (cqlsh) Also apply --connect-timeout to control connection
 +   timeout (CASSANDRA-10959)
 + * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975)
 + * Enable GC logging by default (CASSANDRA-10140)
 + * Optimize pending range computation (CASSANDRA-9258)
 + * Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902)
 + * drop/alter user should be case sensitive (CASSANDRA-10817)
 + * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
 + * Support counter-columns for native aggregates (sum,avg,max,min) (CASSANDRA-9977)
 + * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
 + * Add new types to Stress (CASSANDRA-9556)
 + * Add property to allow listening on broadcast interface (CASSANDRA-9748)
 + * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
 + * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
 + * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 + * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
 + * (cqlsh) encode input correctly when saving history
 +Merged from 2.1:
-  * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938)
   * Fix isJoined return true only after becoming cluster member (CASANDRA-11007)
   * Fix bad gossip generation seen in long-running clusters (CASSANDRA-10969)
   * Avoid NPE when incremental repair fails (CASSANDRA-10909)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c08aaf69/doc/cql3/CQL.textile
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c08aaf69/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------


Mime
View raw message