Updated Branches: refs/heads/cassandra-1.2 4576ccba6 -> 4208a3f56 refs/heads/cassandra-1.2.0 acda52799 -> 9dffa5736 refs/heads/trunk ac16a54a1 -> 47fb7d534
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/47fb7d53 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/47fb7d53 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/47fb7d53 Branch: refs/heads/trunk Commit: 47fb7d5349eadd2f5cb4dba6a9dc657a5ef6bdf2 Parents: ac16a54 4208a3f Author: Yuki Morishita <yu...@apache.org> Authored: Tue Nov 13 17:54:17 2012 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue Nov 13 17:54:17 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/io/sstable/SSTableLoader.java | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) ----------------------------------------------------------------------
