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/3bba76dd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3bba76dd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3bba76dd Branch: refs/heads/trunk Commit: 3bba76dd1ad3ca4fc80d93cfe1ac0dd9e7a73386 Parents: 300f1a6 db381ea Author: Jonathan Ellis <[email protected]> Authored: Mon Aug 26 21:08:00 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon Aug 26 21:08:00 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 2 +- src/java/org/apache/cassandra/dht/Bounds.java | 2 +- .../org/apache/cassandra/io/sstable/SSTableScanner.java | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3bba76dd/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
