cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bened...@apache.org
Subject [9/9] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Thu, 06 Aug 2015 12:37:45 GMT
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/9cd4f829
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9cd4f829
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9cd4f829

Branch: refs/heads/trunk
Commit: 9cd4f8293927f5e67a06c6f3d4e6dd25ab20b35b
Parents: f512995 ace28c9
Author: Benedict Elliott Smith <benedict@apache.org>
Authored: Thu Aug 6 14:37:01 2015 +0200
Committer: Benedict Elliott Smith <benedict@apache.org>
Committed: Thu Aug 6 14:37:01 2015 +0200

----------------------------------------------------------------------
 src/java/org/apache/cassandra/db/Columns.java   | 266 +++++--------------
 .../cassandra/db/view/MaterializedView.java     |   2 +-
 .../org/apache/cassandra/utils/btree/BTree.java |  13 +-
 .../org/apache/cassandra/db/ColumnsTest.java    | 244 +++++++++++++++++
 4 files changed, 320 insertions(+), 205 deletions(-)
----------------------------------------------------------------------



Mime
View raw message