cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Thu, 05 Nov 2015 23:05:03 GMT
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: bc674c1c88064329790f498f8a53a2eb9905c3ae
Parents: c3678f6 1bd2c94
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Thu Nov 5 23:04:53 2015 +0000
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Thu Nov 5 23:04:53 2015 +0000

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../org/apache/cassandra/db/view/ViewUtils.java | 31 ++++++++++++--------
 2 files changed, 19 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc674c1c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 72dc800,ce24c2b..311a07d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Fix MV replica filtering for non-NetworkTopologyStrategy (CASSANDRA-10634)
   * (Hadoop) fix CIF describeSplits() not handling 0 size estimates (CASSANDRA-10600)
   * Fix reading of legacy sstables (CASSANDRA-10590)
   * Use CQL type names in schema metadata tables (CASSANDRA-10365)


Mime
View raw message