You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2016/02/09 07:20:51 UTC
[12/14] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a598ebee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a598ebee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a598ebee
Branch: refs/heads/cassandra-3.0
Commit: a598ebeef47e7affa9d59d0bb95abe71447eed5b
Parents: 0d30540 c08aaf6
Author: Marcus Eriksson <ma...@apache.org>
Authored: Tue Feb 9 07:14:23 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Tue Feb 9 07:15:40 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
doc/cql3/CQL.textile | 2 +-
pylib/cqlshlib/cql3handling.py | 1 -
.../db/compaction/DateTieredCompactionStrategyOptions.java | 6 ++++++
4 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a598ebee/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c6111e5,fdd1122..4074c66
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -8,45 -4,10 +8,46 @@@ Merged from 2.2.6
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)
+3.0.3
+ * Remove double initialization of newly added tables (CASSANDRA-11027)
+ * Filter keys searcher results by target range (CASSANDRA-11104)
+ * Fix deserialization of legacy read commands (CASSANDRA-11087)
+ * Fix incorrect computation of deletion time in sstable metadata (CASSANDRA-11102)
+ * Avoid memory leak when collecting sstable metadata (CASSANDRA-11026)
+ * Mutations do not block for completion under view lock contention (CASSANDRA-10779)
+ * Invalidate legacy schema tables when unloading them (CASSANDRA-11071)
+ * (cqlsh) handle INSERT and UPDATE statements with LWT conditions correctly
+ (CASSANDRA-11003)
+ * Fix DISTINCT queries in mixed version clusters (CASSANDRA-10762)
+ * Migrate build status for indexes along with legacy schema (CASSANDRA-11046)
+ * Ensure SSTables for legacy KEYS indexes can be read (CASSANDRA-11045)
+ * Added support for IBM zSystems architecture (CASSANDRA-11054)
+ * Update CQL documentation (CASSANDRA-10899)
+ * Check the column name, not cell name, for dropped columns when reading
+ legacy sstables (CASSANDRA-11018)
+ * Don't attempt to index clustering values of static rows (CASSANDRA-11021)
+ * Remove checksum files after replaying hints (CASSANDRA-10947)
+ * Support passing base table metadata to custom 2i validation (CASSANDRA-10924)
+ * Ensure stale index entries are purged during reads (CASSANDRA-11013)
+ * Fix AssertionError when removing from list using UPDATE (CASSANDRA-10954)
+ * Fix UnsupportedOperationException when reading old sstable with range
+ tombstone (CASSANDRA-10743)
+ * MV should use the maximum timestamp of the primary key (CASSANDRA-10910)
+ * Fix potential assertion error during compaction (CASSANDRA-10944)
+ * Fix counting of received sstables in streaming (CASSANDRA-10949)
+ * Implement hints compression (CASSANDRA-9428)
+ * Fix potential assertion error when reading static columns (CASSANDRA-10903)
+ * Avoid NoSuchElementException when executing empty batch (CASSANDRA-10711)
+ * Avoid building PartitionUpdate in toString (CASSANDRA-10897)
+ * Reduce heap spent when receiving many SSTables (CASSANDRA-10797)
+ * Add back support for 3rd party auth providers to bulk loader (CASSANDRA-10873)
+ * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653)
+ * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes (CASSANDRA-10837)
+ * Fix sstableloader not working with upper case keyspace name (CASSANDRA-10806)
+Merged from 2.2:
2.2.5
* maxPurgeableTimestamp needs to check memtables too (CASSANDRA-9949)
* Apply change to compaction throughput in real time (CASSANDRA-10025)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a598ebee/doc/cql3/CQL.textile
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a598ebee/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------