Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dbf50505 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dbf50505 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dbf50505 Branch: refs/heads/trunk Commit: dbf5050560ce8346c6ad1c0d306e367eaab1c090 Parents: 12537ca c0c1492 Author: Dave Brosius <dbros...@apache.org> Authored: Sat Jun 1 23:51:54 2013 -0400 Committer: Dave Brosius <dbros...@apache.org> Committed: Sat Jun 1 23:51:54 2013 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/io/sstable/SSTable.java | 11 ++++++++++- .../apache/cassandra/io/sstable/SSTableLoader.java | 2 ++ 3 files changed, 13 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dbf50505/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dbf50505/src/java/org/apache/cassandra/io/sstable/SSTable.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dbf50505/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java ----------------------------------------------------------------------
