cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [11/12] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Tue, 28 Jul 2015 23:56:44 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/a96b207c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a96b207c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a96b207c

Branch: refs/heads/trunk
Commit: a96b207c3e84e01324a0ca5b81e6b45f3eea68bb
Parents: 0ba915d 7395207
Author: Yuki Morishita <yukim@apache.org>
Authored: Tue Jul 28 16:51:06 2015 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Tue Jul 28 16:51:06 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 ++
 .../apache/cassandra/db/ColumnFamilyStore.java  |  3 ++-
 .../io/sstable/format/SSTableReader.java        | 28 ++++++++++++--------
 3 files changed, 21 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a96b207c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 36d0485,c4bb21c..4717fca
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,6 +1,19 @@@
 -2.1.9
 - * Commit log segment recycling is disabled by default (CASSANDRA-9896)
 +2.2.1
 + * UDF / UDA execution time in trace (CASSANDRA-9723)
 + * Remove repair snapshot leftover on startup (CASSANDRA-7357)
 + * Use random nodes for batch log when only 2 racks (CASSANDRA-8735)
 +Merged from 2.1:
   * Add consistency level to tracing ouput (CASSANDRA-9827)
 +Merged from 2.0:
 + * Log when messages are dropped due to cross_node_timeout (CASSANDRA-9793)
++ * Don't track hotness when opening from snapshot for validation (CASSANDRA-9382)
 +
 +2.2.0
 + * Fix cqlsh copy methods and other windows specific issues (CASSANDRA-9795) 
 + * Don't wrap byte arrays in SequentialWriter (CASSANDRA-9797)
 + * sum() and avg() functions missing for smallint and tinyint types (CASSANDRA-9671)
 + * Revert CASSANDRA-9542 (allow native functions in UDA) (CASSANDRA-9771)
 +Merged from 2.1:
   * Fix MarshalException when upgrading superColumn family (CASSANDRA-9582)
   * Fix broken logging for "empty" flushes in Memtable (CASSANDRA-9837)
   * Handle corrupt files on startup (CASSANDRA-9686)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a96b207c/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------


Mime
View raw message