Updated Branches: refs/heads/trunk 23b1c5249 -> c5649e072
Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c5649e07 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5649e07 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5649e07 Branch: refs/heads/trunk Commit: c5649e072c448f4683aab94c821152faf26745f1 Parents: 23b1c52 d4eaf3c Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Mar 16 11:27:41 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Mar 16 11:27:41 2012 +0100 ---------------------------------------------------------------------- .../io/sstable/SSTableIdentityIterator.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5649e07/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java ----------------------------------------------------------------------
