cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [5/5] git commit: Merge branch 'cassandra-2.1' into trunk
Date Wed, 12 Mar 2014 23:30:30 GMT
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: c1647c59e414565d60d3936fe834106f66c6ef13
Parents: f32c4da 0cb1e3d
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Wed Mar 12 18:30:18 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Wed Mar 12 18:30:18 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |   2 +-
 .../org/apache/cassandra/utils/btree/BTree.java |  49 ++++++--
 .../apache/cassandra/utils/btree/Builder.java   |   8 +-
 .../cassandra/utils/btree/NodeBuilder.java      |   2 +-
 .../cassandra/utils/btree/UpdateFunction.java   |   1 -
 .../apache/cassandra/db/RangeTombstoneTest.java |   8 +-
 .../org/apache/cassandra/utils/BTreeTest.java   | 125 +++++++++++++++++++
 7 files changed, 175 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c1647c59/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c1647c59/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
----------------------------------------------------------------------


Mime
View raw message