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/699189f1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/699189f1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/699189f1 Branch: refs/heads/trunk Commit: 699189f197ec93606492d03d93917884471bc216 Parents: 0493da9 2574f05 Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri Mar 21 22:00:26 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Mar 21 22:00:26 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/DataTracker.java | 6 ++++++ 1 file changed, 6 insertions(+) ----------------------------------------------------------------------
