cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject [5/6] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Fri, 17 Jul 2015 06:39:42 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/f74419cd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f74419cd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f74419cd

Branch: refs/heads/cassandra-2.2
Commit: f74419cd2b13c3c8fe01d09df16f7edae583fe35
Parents: 2b99b5d 1eda7cb
Author: Robert Stupp <snazy@snazy.de>
Authored: Fri Jul 17 08:37:37 2015 +0200
Committer: Robert Stupp <snazy@snazy.de>
Committed: Fri Jul 17 08:37:37 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f74419cd/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b4ea4b4,49cc850..e6c093d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 -2.1.9
 +2.2.0-rc3
 + * 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 broken logging for "empty" flushes in Memtable (CASSANDRA-9837)
   * Complete CASSANDRA-8448 fix (CASSANDRA-9519)
   * Handle corrupt files on startup (CASSANDRA-9686)
   * Fix clientutil jar and tests (CASSANDRA-9760)

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


Mime
View raw message