Merge branch 'cassandra-1.1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/57de08a9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57de08a9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57de08a9 Branch: refs/heads/trunk Commit: 57de08a9d985eb9d4583c52c56890c7db977a86f Parents: 7c50df3 251e050 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Apr 17 16:26:31 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Apr 17 16:26:31 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 4 ++++ .../io/sstable/AbstractSSTableSimpleWriter.java | 2 +- .../io/sstable/SSTableSimpleUnsortedWriter.java | 5 ++++- .../cassandra/io/sstable/SSTableSimpleWriter.java | 14 +++++++++++--- 4 files changed, 20 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/57de08a9/CHANGES.txt ----------------------------------------------------------------------
