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/9a58e7e2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a58e7e2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a58e7e2 Branch: refs/heads/trunk Commit: 9a58e7e2ef4d9bdf1c733108b3a79a37bd0f6f25 Parents: 21f2094 7b4639a Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Nov 28 00:35:58 2012 +0900 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Nov 28 00:35:58 2012 +0900 ---------------------------------------------------------------------- .../apache/cassandra/io/sstable/SSTableReader.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
