Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d9f9c5b2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d9f9c5b2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d9f9c5b2 Branch: refs/heads/trunk Commit: d9f9c5b21174f8599f3013d7098c35c7fa8baa82 Parents: 41ffca1 2e95a4f Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Jan 28 17:23:47 2014 -0600 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Jan 28 17:23:47 2014 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/DataTracker.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9f9c5b2/src/java/org/apache/cassandra/db/DataTracker.java ----------------------------------------------------------------------
