Updated Branches: refs/heads/cassandra-1.0 5434ac4a0 -> 10a64bd68 refs/heads/cassandra-1.1 7c50df3f6 -> 57de08a9d refs/heads/cassandra-1.1.0 a4a83fc07 -> 251e05012 refs/heads/trunk ec04fe3ca -> db4811e13
Merge branch 'cassandra-1.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/db4811e1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db4811e1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/db4811e1 Branch: refs/heads/trunk Commit: db4811e13207db31f62dba23882a1f53b6b7965a Parents: ec04fe3 57de08a Author: Jonathan Ellis <[email protected]> Authored: Tue Apr 17 16:27:22 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Tue Apr 17 16:27:22 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/db4811e1/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/db4811e1/src/java/org/apache/cassandra/io/sstable/AbstractSSTableSimpleWriter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/db4811e1/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/db4811e1/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java ----------------------------------------------------------------------
