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/34910c5a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/34910c5a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/34910c5a Branch: refs/heads/trunk Commit: 34910c5a3a5ee94681f932afcc95ea39e2ed8315 Parents: f90a611 8afc76a Author: Joshua McKenzie <[email protected]> Authored: Tue Aug 25 12:20:40 2015 -0400 Committer: Joshua McKenzie <[email protected]> Committed: Tue Aug 25 12:20:40 2015 -0400 ---------------------------------------------------------------------- .../cassandra/io/sstable/SSTableLoaderTest.java | 39 ++++++++++++++++++-- 1 file changed, 36 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
