cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [5/6] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X
Date Tue, 22 Nov 2016 17:03:14 GMT
Merge branch 'cassandra-3.11' into cassandra-3.X


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

Branch: refs/heads/cassandra-3.X
Commit: d15274522cd027a47eb7b9bd96592433253c98aa
Parents: 8b3de2f 9cc0c80
Author: Sam Tunnicliffe <sam@beobal.com>
Authored: Tue Nov 22 16:58:18 2016 +0000
Committer: Sam Tunnicliffe <sam@beobal.com>
Committed: Tue Nov 22 16:58:18 2016 +0000

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../cassandra/config/ColumnDefinition.java      |  24 ++++-
 .../apache/cassandra/db/marshal/UserType.java   |  15 +++
 .../apache/cassandra/db/rows/AbstractCell.java  |  18 +---
 .../apache/cassandra/db/rows/AbstractRow.java   |  34 +++++--
 .../cassandra/thrift/ThriftValidation.java      |   3 +-
 test/unit/org/apache/cassandra/db/CellTest.java | 100 ++++++++++++++++++-
 7 files changed, 165 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1527452/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 1f1625c,92bf1ce..b1fd83f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 +3.12
 + * Add support for arithmetic operators (CASSANDRA-11935)
 +
  3.11
+  * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
   * AnticompactionRequestSerializer serializedSize is incorrect (CASSANDRA-12934)
  
  3.10

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1527452/src/java/org/apache/cassandra/db/marshal/UserType.java
----------------------------------------------------------------------


Mime
View raw message