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/13f21db9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/13f21db9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/13f21db9 Branch: refs/heads/trunk Commit: 13f21db96f403705ad8cedb3413ab87228d4c4e9 Parents: 1353e0a 810f067 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Oct 14 10:38:30 2013 +0100 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Oct 14 10:38:30 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/DataTracker.java | 30 ++++++++++++++------ .../cassandra/io/sstable/SSTableReader.java | 4 +-- 3 files changed, 25 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/13f21db9/CHANGES.txt ----------------------------------------------------------------------
