cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Date Fri, 19 Dec 2014 17:08:40 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/9616a88f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9616a88f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9616a88f

Branch: refs/heads/trunk
Commit: 9616a88f7e358865d0d05ce0575a392dc075c5a5
Parents: 82a97f5 7c6993f
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Dec 19 18:07:35 2014 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Dec 19 18:07:35 2014 +0100

----------------------------------------------------------------------
 CHANGES.txt                                          |  1 +
 .../cassandra/cql3/statements/SelectStatement.java   |  2 +-
 .../cassandra/service/pager/MultiPartitionPager.java | 15 ++++-----------
 .../org/apache/cassandra/service/pager/Pageable.java |  5 ++++-
 .../apache/cassandra/service/pager/QueryPagers.java  |  2 +-
 .../org/apache/cassandra/service/QueryPagerTest.java |  2 +-
 6 files changed, 12 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9616a88f/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9616a88f/test/unit/org/apache/cassandra/service/QueryPagerTest.java
----------------------------------------------------------------------


Mime
View raw message