cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ble...@apache.org
Subject [2/2] cassandra git commit: Merge branch cassandra-3.X into trunk
Date Mon, 19 Dec 2016 15:00:40 GMT
Merge branch cassandra-3.X into trunk


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

Branch: refs/heads/trunk
Commit: aa124a1da7b7bb493b5de2d70bfb63aebee24e95
Parents: 57c0eee 5d48b0d
Author: Benjamin Lerer <b.lerer@gmail.com>
Authored: Mon Dec 19 15:59:58 2016 +0100
Committer: Benjamin Lerer <b.lerer@gmail.com>
Committed: Mon Dec 19 16:00:11 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../restrictions/StatementRestrictions.java     |  7 ---
 .../cassandra/cql3/selection/Selection.java     | 14 ------
 .../cql3/statements/ModificationStatement.java  |  2 +-
 .../cql3/statements/SelectStatement.java        |  1 -
 .../cql3/statements/UpdateStatement.java        |  2 -
 .../validation/entities/CollectionsTest.java    | 51 +++++++++++++++++---
 7 files changed, 46 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa124a1d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 1b1c1f1,d4da5c4..618446d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
 +4.0
 + * Thrift removal (CASSANDRA-11115)
 + * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716)
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422)
 +
 +
  3.12
+  * Allow IN restrictions on column families with collections (CASSANDRA-12654)
   * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)
   * nodetool stopdaemon errors out (CASSANDRA-13030)
   * Log message size in trace message in OutboundTcpConnection (CASSANDRA-13028)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa124a1d/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa124a1d/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa124a1d/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa124a1d/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
----------------------------------------------------------------------


Mime
View raw message