cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bened...@apache.org
Subject [6/6] git commit: Merge branch 'cassandra-2.1' into trunk
Date Mon, 07 Jul 2014 20:13:23 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/e58f379c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e58f379c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e58f379c

Branch: refs/heads/trunk
Commit: e58f379ca01942ddc5628fa16fe97d708667d2ca
Parents: 047c046 ec38458
Author: Benedict Elliott Smith <benedict@apache.org>
Authored: Mon Jul 7 21:13:03 2014 +0100
Committer: Benedict Elliott Smith <benedict@apache.org>
Committed: Mon Jul 7 21:13:03 2014 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../org/apache/cassandra/db/AbstractCell.java   | 16 ++---
 .../apache/cassandra/db/BufferExpiringCell.java | 22 ++++++
 .../apache/cassandra/db/NativeExpiringCell.java | 22 ++++++
 test/unit/org/apache/cassandra/db/CellTest.java | 76 ++++++++++++++++++++
 5 files changed, 127 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


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


Mime
View raw message