Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4208a3f5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4208a3f5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4208a3f5 Branch: refs/heads/cassandra-1.2 Commit: 4208a3f56c34723f83aa63dd5fd0f8f6a082b132 Parents: 4576ccb 9dffa57 Author: Yuki Morishita <yu...@apache.org> Authored: Tue Nov 13 17:54:04 2012 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue Nov 13 17:54:04 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/io/sstable/SSTableLoader.java | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4208a3f5/CHANGES.txt ----------------------------------------------------------------------
