You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2013/12/18 11:24:05 UTC
[4/5] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1273476f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1273476f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1273476f
Branch: refs/heads/trunk
Commit: 1273476f95447a0661ddc7789067cc9a0e085f5b
Parents: 6635cde 7c32ffb
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Dec 18 11:19:39 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Dec 18 11:19:39 2013 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 +
.../org/apache/cassandra/cql3/CFPropDefs.java | 5 ++
.../org/apache/cassandra/cql3/KSPropDefs.java | 5 ++
.../service/pager/AbstractQueryPager.java | 6 +-
.../service/pager/MultiPartitionPager.java | 89 +++++++++++++-------
.../service/pager/NamesQueryPager.java | 5 +-
.../cassandra/service/pager/QueryPagers.java | 5 +-
.../service/pager/SinglePartitionPager.java | 3 +
.../service/pager/SliceQueryPager.java | 5 ++
9 files changed, 87 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1273476f/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1273476f/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1273476f/src/java/org/apache/cassandra/service/pager/QueryPagers.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1273476f/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java
----------------------------------------------------------------------