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/5dfe2412 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5dfe2412 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5dfe2412 Branch: refs/heads/trunk Commit: 5dfe24124de718fb1dd55857fc882b2000bfa6f2 Parents: c1af1db 2e916f9 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Apr 7 15:12:38 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Apr 7 15:12:38 2014 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/net/MessagingService.java | 5 +++++ .../org/apache/cassandra/service/StorageService.java | 14 ++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5dfe2412/src/java/org/apache/cassandra/net/MessagingService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5dfe2412/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
