Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ac3b1cc2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac3b1cc2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac3b1cc2 Branch: refs/heads/trunk Commit: ac3b1cc2c7eef99f1fb12e42202194f40447e544 Parents: e90ec26 b263af9 Author: Benedict Elliott Smith <[email protected]> Authored: Tue Sep 15 17:50:43 2015 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Tue Sep 15 17:50:43 2015 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/rows/Rows.java | 32 +- test/unit/org/apache/cassandra/db/CellTest.java | 48 +- .../apache/cassandra/db/rows/RowBuilder.java | 85 +++ .../org/apache/cassandra/db/rows/RowsTest.java | 548 +++++++++++++++++++ .../cassandra/service/DataResolverTest.java | 225 +++++++- 5 files changed, 927 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
