cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [09/10] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X
Date Mon, 05 Dec 2016 11:13:55 GMT
Merge branch 'cassandra-3.11' into cassandra-3.X

* cassandra-3.11:
  Reject default_time_to_live option when creating or altering MVs


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

Branch: refs/heads/trunk
Commit: 918a062122d108f7f8055cf287b2508e70d38e7a
Parents: 36a3ba0 a06b469
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Mon Dec 5 12:11:33 2016 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Mon Dec 5 12:11:33 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  4 ++
 NEWS.txt                                        |  9 +++++
 .../cql3/statements/AlterViewStatement.java     |  8 ++++
 .../cql3/statements/CreateViewStatement.java    | 11 ++++-
 .../org/apache/cassandra/cql3/ViewTest.java     | 42 ++++++++++++++++++++
 5 files changed, 73 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/918a0621/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b75a1e4,e69a67a..5a3fedf
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,7 +1,13 @@@
 +3.12
 + * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983)
 + * cqlsh auto completion: refactor definition of compaction strategy options (CASSANDRA-12946)
 + * Add support for arithmetic operators (CASSANDRA-11935)
 + * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
 +
+ 3.11
+ Merged from 3.0:
+  * Reject default_time_to_live option when creating or altering MVs (CASSANDRA-12868)
+ 
  3.10
   * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
   * Remove timing window in test case (CASSANDRA-12875)


Mime
View raw message