You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ca...@apache.org on 2016/01/12 18:32:17 UTC
[16/19] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a942b2ce
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a942b2ce
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a942b2ce
Branch: refs/heads/cassandra-3.0
Commit: a942b2ceb8fcd9edb6d99a15406b2018426c4f48
Parents: 4c7b06b a6e5cda
Author: Carl Yeksigian <ca...@apache.org>
Authored: Tue Jan 12 12:27:41 2016 -0500
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Tue Jan 12 12:27:41 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
.../apache/cassandra/io/sstable/format/SSTableReader.java | 10 +++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a942b2ce/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a942b2ce/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
----------------------------------------------------------------------