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/eeb7965d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eeb7965d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eeb7965d Branch: refs/heads/trunk Commit: eeb7965dbbdb680015abc8db9b91d3ff80396abb Parents: 956fa77 cb45b41 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Dec 10 09:00:07 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Dec 10 09:00:07 2012 -0600 ---------------------------------------------------------------------- .../apache/cassandra/io/sstable/SSTableReader.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
