Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5102e8d7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5102e8d7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5102e8d7 Branch: refs/heads/trunk Commit: 5102e8d748289876964305292d75f5eba28a40dd Parents: 7d03e28 278f210 Author: Jonathan Ellis <[email protected]> Authored: Wed Sep 18 09:46:01 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Sep 18 09:46:01 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 - .../db/columniterator/SSTableNamesIterator.java | 34 ++++---------------- 2 files changed, 7 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5102e8d7/CHANGES.txt ----------------------------------------------------------------------
