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/90292571 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90292571 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/90292571 Branch: refs/heads/trunk Commit: 90292571663e7ba8cf9b625b0d89fd67ae1bcc3e Parents: 99fbafe ad57cb0 Author: Vijay <vijay2...@gmail.com> Authored: Tue Apr 22 21:36:20 2014 -0700 Committer: Vijay <vijay2...@gmail.com> Committed: Tue Apr 22 21:36:20 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/90292571/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
