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/2e916f97 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e916f97 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e916f97 Branch: refs/heads/trunk Commit: 2e916f97335dd39dc1d241dbff67cad2e1475f3e Parents: c1a1a00 2dd0907 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Apr 7 15:12:13 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Apr 7 15:12:13 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/2e916f97/src/java/org/apache/cassandra/net/MessagingService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e916f97/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
