Updated Branches: refs/heads/cassandra-1.1 5b511b621 -> 6b8a0d9f1 refs/heads/cassandra-1.2 956fa7768 -> eeb7965db refs/heads/cassandra-1.2.0 dbbca5e29 -> cb45b4149 refs/heads/trunk ea4f28505 -> 69e6c0b8b
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/69e6c0b8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69e6c0b8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/69e6c0b8 Branch: refs/heads/trunk Commit: 69e6c0b8be1a7db92bcad091ee8498961e8ca921 Parents: ea4f285 eeb7965 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Dec 10 09:00:20 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Dec 10 09:00:20 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/69e6c0b8/src/java/org/apache/cassandra/io/sstable/SSTableReader.java ----------------------------------------------------------------------
