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/b0f51cec Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b0f51cec Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b0f51cec Branch: refs/heads/trunk Commit: b0f51cecb610af4896ead7ade970a42366298349 Parents: f782f14 d152745 Author: Sam Tunnicliffe <s...@beobal.com> Authored: Tue Nov 22 17:00:49 2016 +0000 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Tue Nov 22 17:00:49 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/b0f51cec/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0f51cec/src/java/org/apache/cassandra/config/ColumnDefinition.java ----------------------------------------------------------------------
