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/6f36ebbf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f36ebbf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f36ebbf Branch: refs/heads/trunk Commit: 6f36ebbf9b5eaaa7fe5ef5a2bcacccc0712da612 Parents: 93849e7 5a79f56 Author: Marcus Eriksson <marc...@apache.org> Authored: Tue May 13 10:09:14 2014 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Tue May 13 10:09:14 2014 +0200 ---------------------------------------------------------------------- .../org/apache/cassandra/io/sstable/SSTableRewriter.java | 2 +- src/java/org/apache/cassandra/io/sstable/SSTableWriter.java | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f36ebbf/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java ----------------------------------------------------------------------
