Merge branch 'cassandra-1.1' into cassandra-1.2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cb45b414 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb45b414 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cb45b414 Branch: refs/heads/cassandra-1.2 Commit: cb45b4149d26196a55d42817e1847b81b6954d77 Parents: dbbca5e 6b8a0d9 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Dec 10 08:59:52 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Dec 10 08:59:52 2012 -0600 ---------------------------------------------------------------------- .../apache/cassandra/io/sstable/SSTableReader.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb45b414/src/java/org/apache/cassandra/io/sstable/SSTableReader.java ----------------------------------------------------------------------
