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/031f8997 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/031f8997 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/031f8997 Branch: refs/heads/trunk Commit: 031f8997b1fba4ffe26187054dc8fecaa541df2e Parents: c48acd9 79c2ff7 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Apr 23 13:14:33 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Apr 23 13:14:33 2013 -0500 ---------------------------------------------------------------------- .../db/columniterator/SSTableNamesIterator.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/031f8997/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java ----------------------------------------------------------------------
