Merge branch 'cassandra-2.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/97a529f0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/97a529f0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/97a529f0 Branch: refs/heads/trunk Commit: 97a529f0662f92b6539dbff426ca252ad1713954 Parents: 89b8b1a 8e101be Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Feb 19 10:01:19 2014 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Feb 19 10:01:19 2014 -0600 ---------------------------------------------------------------------- .../apache/cassandra/db/ColumnFamilyStore.java | 30 +++++++------------- .../org/apache/cassandra/db/DataTracker.java | 21 ++++++++------ 2 files changed, 23 insertions(+), 28 deletions(-) ----------------------------------------------------------------------
