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/1bc8ffda Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1bc8ffda Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1bc8ffda Branch: refs/heads/trunk Commit: 1bc8ffdae24f1362aa04088991ad44b84e194d13 Parents: f92d00c bff7572 Author: Marcus Eriksson <marc...@apache.org> Authored: Mon Sep 1 09:13:32 2014 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Mon Sep 1 09:13:32 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/DataTracker.java | 6 ++++++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1bc8ffda/CHANGES.txt ----------------------------------------------------------------------
