Merge branch 'cassandra-3.0' into trunk
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8644338f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8644338f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8644338f
Branch: refs/heads/trunk
Commit: 8644338fc8b84a943b9ae78c05b9bb862f107b2d
Parents: 3bcdc4b dc61fa6
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Oct 13 11:04:28 2015 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Oct 13 11:04:28 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 3 +-
src/java/org/apache/cassandra/db/view/View.java | 6 +++-
.../apache/cassandra/db/view/ViewManager.java | 22 ++++++------
.../org/apache/cassandra/cql3/ViewTest.java | 35 ++++++++++++++++++++
4 files changed, 54 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8644338f/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index cdcc2eb,3b63714..59cd12a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
+3.2
+ * Abort in-progress queries that time out (CASSANDRA-7392)
+ * Add transparent data encryption core classes (CASSANDRA-9945)
+
+
- 3.0
+ 3.0-rc2
+ * Fix NPE in MVs on update (CASSANDRA-10503)
* Only include modified cell data in indexing deltas (CASSANDRA-10438)
* Do not load keyspace when creating sstable writer (CASSANDRA-10443)
* If node is not yet gossiping write all MV updates to batchlog only (CASSANDRA-10413)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8644338f/src/java/org/apache/cassandra/db/view/View.java
----------------------------------------------------------------------
|