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/6f5c7a4e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f5c7a4e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f5c7a4e Branch: refs/heads/trunk Commit: 6f5c7a4ea20f0de4a82a945c8d64c82f7980317b Parents: 418ecb5 a29d206 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Sep 18 18:28:00 2015 +0100 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Sep 18 18:28:00 2015 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/config/Schema.java | 9 +- .../io/sstable/format/SSTableReader.java | 6 + .../sstable/format/ClientModeSSTableTest.java | 135 +++++++++++++++++++ 3 files changed, 147 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
