cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1
Date Thu, 20 Feb 2014 20:07:52 GMT
Merge branch 'cassandra-2.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 76e5c93fb9eb6c3554a1a04fd4b5daa6e7fdbd05
Parents: 3d7019c 6ed241a
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Thu Feb 20 21:07:27 2014 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Thu Feb 20 21:07:27 2014 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |   2 +
 .../cassandra/db/ArrayBackedSortedColumns.java  | 126 +++++++++++--------
 .../apache/cassandra/db/AtomicBTreeColumns.java |  16 ++-
 .../org/apache/cassandra/db/ColumnFamily.java   |   7 +-
 .../AbstractSimplePerColumnSecondaryIndex.java  |  19 +--
 .../org/apache/cassandra/utils/btree/BTree.java |  24 +++-
 6 files changed, 116 insertions(+), 78 deletions(-)
----------------------------------------------------------------------



Mime
View raw message