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/91893660 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91893660 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/91893660 Branch: refs/heads/trunk Commit: 918936600a8f16c4063deb9d15f845b83136c2e5 Parents: 2ba3946 d9f9c5b Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Jan 28 17:24:10 2014 -0600 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Jan 28 17:24:10 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/91893660/src/java/org/apache/cassandra/db/DataTracker.java ----------------------------------------------------------------------
