Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/33939cae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/33939cae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/33939cae Branch: refs/heads/trunk Commit: 33939cae69a7af747f81ef1f2166b4275e6efe05 Parents: 15e0814 33bc1e8 Author: Marcus Eriksson <[email protected]> Authored: Thu May 15 08:18:52 2014 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Thu May 15 08:18:52 2014 +0200 ---------------------------------------------------------------------- .../apache/cassandra/db/ColumnFamilyStore.java | 2 +- .../cassandra/io/sstable/SSTableReader.java | 26 +++++++++++++------- .../cassandra/io/sstable/SSTableWriter.java | 5 ++-- 3 files changed, 21 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/33939cae/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java ----------------------------------------------------------------------
