cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Date Wed, 27 May 2015 18:54:26 GMT
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: eb60f3101985b67eba8f96af63b0a214c4f41969
Parents: e9a263d 80ba11c
Author: Tyler Hobbs <tylerlhobbs@gmail.com>
Authored: Wed May 27 13:54:09 2015 -0500
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Wed May 27 13:54:09 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  3 +
 .../apache/cassandra/db/ColumnFamilyStore.java  |  4 +-
 src/java/org/apache/cassandra/db/DataRange.java | 82 ++++++++++++++++---
 .../cassandra/db/SliceFromReadCommand.java      | 28 +++++++
 .../cassandra/db/filter/ColumnCounter.java      | 63 ++++++++++++++-
 .../cassandra/db/filter/SliceQueryFilter.java   | 83 ++++++++++++++++++--
 .../service/pager/AbstractQueryPager.java       | 40 ++++++++--
 .../service/pager/RangeSliceQueryPager.java     |  4 +-
 .../service/pager/SliceQueryPager.java          |  6 +-
 .../service/pager/AbstractQueryPagerTest.java   |  8 +-
 10 files changed, 281 insertions(+), 40 deletions(-)
----------------------------------------------------------------------


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


Mime
View raw message