Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e37ca25c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e37ca25c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e37ca25c Branch: refs/heads/trunk Commit: e37ca25cf18489ee087965b3b388ad9332bf60c8 Parents: 3bef1cc 8a42217 Author: Marcus Eriksson <marc...@spotify.com> Authored: Thu Apr 4 23:39:38 2013 +0200 Committer: Marcus Eriksson <marc...@spotify.com> Committed: Thu Apr 4 23:39:38 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/DataTracker.java | 21 ++++++---------- 2 files changed, 9 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e37ca25c/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e37ca25c/src/java/org/apache/cassandra/db/DataTracker.java ----------------------------------------------------------------------
