cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Fri, 18 Sep 2015 10:13:29 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/5400b93b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5400b93b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5400b93b

Branch: refs/heads/trunk
Commit: 5400b93bbcbb6b3e3831d5b5a9ecfcd846f55034
Parents: 82dfc29 9f335fe
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Sep 18 12:13:21 2015 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Sep 18 12:13:21 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 src/java/org/apache/cassandra/db/view/View.java | 17 +++--
 .../org/apache/cassandra/cql3/ViewTest.java     | 76 +++++++++++++++++++-
 3 files changed, 85 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5400b93b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7e4e378,d6554e9..334927a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 +3.2
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0.0-rc1
+  * Fix minor bugs in MV handling (CASSANDRA-10362)
   * Allow custom indexes with 0,1 or multiple target columns (CASSANDRA-10124)
   * Improve MV schema representation (CASSANDRA-9921)
   * Add flag to enable/disable coordinator batchlog for MV writes (CASSANDRA-10230)


Mime
View raw message