Merge branch 'cassandra-3.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/ae7afb7a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ae7afb7a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ae7afb7a Branch: refs/heads/trunk Commit: ae7afb7a8fee7ed65af515a8f05ee1755f43b827 Parents: 05caec7 0828e24 Author: Robert Stupp <[email protected]> Authored: Mon Aug 31 11:07:39 2015 +0200 Committer: Robert Stupp <[email protected]> Committed: Mon Aug 31 11:07:39 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae7afb7a/CHANGES.txt ----------------------------------------------------------------------
