Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ad57cb01 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad57cb01 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ad57cb01 Branch: refs/heads/cassandra-2.1 Commit: ad57cb010231a89d8795a0944bd99eb6e72079cc Parents: 2c7622a 4e4d7bb Author: Vijay <vijay2...@gmail.com> Authored: Tue Apr 22 21:34:22 2014 -0700 Committer: Vijay <vijay2...@gmail.com> Committed: Tue Apr 22 21:34:22 2014 -0700 ---------------------------------------------------------------------- .../org/apache/cassandra/locator/DynamicEndpointSnitch.java | 2 +- src/java/org/apache/cassandra/service/StorageService.java | 5 +++++ .../org/apache/cassandra/utils/BackgroundActivityMonitor.java | 7 +++++++ 3 files changed, 13 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad57cb01/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
