cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Date Wed, 02 Apr 2014 18:19:53 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/500503d6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/500503d6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/500503d6

Branch: refs/heads/trunk
Commit: 500503d6d573eac02dba8332d13ac502648b6ac7
Parents: 3e0dac5 ab1a02c
Author: Tyler Hobbs <tyler@datastax.com>
Authored: Wed Apr 2 13:17:54 2014 -0500
Committer: Tyler Hobbs <tyler@datastax.com>
Committed: Wed Apr 2 13:17:54 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../cql3/statements/SelectStatement.java        |   7 +-
 .../apache/cassandra/db/filter/ColumnSlice.java |  32 +-
 .../service/pager/AbstractQueryPager.java       |  11 +
 .../service/pager/SliceQueryPager.java          |   5 +
 .../cassandra/db/filter/ColumnSliceTest.java    | 290 +++++++++++++++++++
 6 files changed, 342 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


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


Mime
View raw message