cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [2/3] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Fri, 08 May 2015 08:46:19 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt


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

Branch: refs/heads/trunk
Commit: e2ad784c73f6084de072b01d4652812c226b19be
Parents: 09ccf60 917068d
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Fri May 8 10:44:34 2015 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Fri May 8 10:44:34 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt                                                      | 1 +
 src/java/org/apache/cassandra/db/compaction/LeveledManifest.java | 2 ++
 2 files changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2ad784c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 098cfe0,1540d28..37f0117
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,5 +1,22 @@@
 -2.0.15:
 +2.1.6
 + * Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606)
 + * Improve sstable exclusion from partition tombstones (CASSANDRA-9298)
 + * Validate the indexed column rather than the cell's contents for 2i (CASSANDRA-9057)
 + * Add support for top-k custom 2i queries (CASSANDRA-8717)
 + * Fix error when dropping table during compaction (CASSANDRA-9251)
 + * cassandra-stress supports validation operations over user profiles (CASSANDRA-8773)
 + * Add support for rate limiting log messages (CASSANDRA-9029)
 + * Log the partition key with tombstone warnings (CASSANDRA-8561)
 + * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271)
 + * Fix PITR commitlog replay (CASSANDRA-9195)
 + * GCInspector logs very different times (CASSANDRA-9124)
 + * Fix deleting from an empty list (CASSANDRA-9198)
 + * Update tuple and collection types that use a user-defined type when that UDT
 +   is modified (CASSANDRA-9148, CASSANDRA-9192)
 + * Use higher timeout for prepair and snapshot in repair (CASSANDRA-9261)
 + * Fix anticompaction blocking ANTI_ENTROPY stage (CASSANDRA-9151)
 +Merged from 2.0:
+  * Avoid potential overlap in LCS with single-partition sstables (CASSANDRA-9322)
   * Log warning message when a table is queried before the schema has fully
     propagated (CASSANDRA-9136)
   * Overload SecondaryIndex#indexes to accept the column definition (CASSANDRA-9314)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2ad784c/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
----------------------------------------------------------------------


Mime
View raw message