cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Fri, 24 Jul 2015 07:25:23 GMT
Merge branch 'cassandra-2.1' into cassandra-2.2

Conflicts:
	src/java/org/apache/cassandra/service/pager/SliceQueryPager.java


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

Branch: refs/heads/cassandra-2.2
Commit: 0355a77aa5273de54972daf46be5f6ebeb6f9a9e
Parents: 9ad1330 b087897
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Jul 24 09:25:15 2015 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Jul 24 09:25:15 2015 +0200

----------------------------------------------------------------------
 .../cassandra/service/pager/RangeSliceQueryPager.java  |  5 ++++-
 .../cassandra/service/pager/SliceQueryPager.java       | 13 +++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------



Mime
View raw message