fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2a167ea2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a167ea2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2a167ea2 Branch: refs/heads/trunk Commit: 2a167ea21ea1db1903ccdf01172eb55c39b4f506 Parents: 15c92c3 Author: Benedict Elliott Smith <bened...@apache.org> Authored: Fri Feb 13 10:47:00 2015 +0000 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Fri Feb 13 10:47:00 2015 +0000 ---------------------------------------------------------------------- .../apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java | 2 +- src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a167ea2/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java index 38ba76a..af720c0 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java @@ -227,7 +227,7 @@ public class SSTableSimpleUnsortedWriter extends AbstractSSTableSimpleWriter throw new AssertionError("Empty partition"); first = false; } - writer.close(true); + writer.close(); } } catch (Throwable e) http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a167ea2/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java index 5849465..87c8e33 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java @@ -71,7 +71,7 @@ public class SSTableSimpleWriter extends AbstractSSTableSimpleWriter { if (currentKey != null) writeRow(currentKey, columnFamily); - writer.close(true); + writer.close(); } catch (FSError e) {
