Updated Branches: refs/heads/cassandra-1.2 21f2094c7 -> 9a58e7e2e refs/heads/cassandra-1.2.0 93738e312 -> 7b4639ab2 refs/heads/trunk d436aed39 -> 555295017
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/55529501 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/55529501 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/55529501 Branch: refs/heads/trunk Commit: 555295017e9bd33f25e007e76d2003aa3a15ae8a Parents: d436aed 9a58e7e Author: Jonathan Ellis <[email protected]> Authored: Wed Nov 28 00:36:03 2012 +0900 Committer: Jonathan Ellis <[email protected]> Committed: Wed Nov 28 00:36:03 2012 +0900 ---------------------------------------------------------------------- .../apache/cassandra/io/sstable/SSTableReader.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
