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 2015/01/14 14:17:57 UTC
[3/4] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cf07fc25
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf07fc25
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cf07fc25
Branch: refs/heads/trunk
Commit: cf07fc259799bc403ab4946f9dcb142da1c11ed5
Parents: 0a17c0f 92f7539
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Jan 14 14:14:16 2015 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Jan 14 14:14:16 2015 +0100
----------------------------------------------------------------------
.../apache/cassandra/db/columniterator/IndexedSliceReader.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf07fc25/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
----------------------------------------------------------------------