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/51ff4997 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51ff4997 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/51ff4997 Branch: refs/heads/cassandra-2.2 Commit: 51ff499754b2668ee2425ca72733506f875b2c64 Parents: 1657639 1c80b04 Author: Yuki Morishita <yu...@apache.org> Authored: Thu Jul 23 10:25:48 2015 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Thu Jul 23 10:25:48 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/BatchlogManager.java | 4 +++- .../cassandra/service/BatchlogEndpointFilterTest.java | 9 +++++---- 3 files changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/51ff4997/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 0fb392a,69a7b31..b8593c0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,4 +1,14 @@@ -2.1.9 +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) + +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/51ff4997/src/java/org/apache/cassandra/db/BatchlogManager.java ----------------------------------------------------------------------
