Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/71c9209e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/71c9209e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/71c9209e Branch: refs/heads/trunk Commit: 71c9209e765ddf496deebf64d2ad1b7ab5ffa1a8 Parents: 4fb0904 15c738c Author: Dave Brosius <[email protected]> Authored: Fri Sep 20 23:36:11 2013 -0400 Committer: Dave Brosius <[email protected]> Committed: Fri Sep 20 23:36:11 2013 -0400 ---------------------------------------------------------------------- CHANGES.txt | 5 ++ .../apache/cassandra/net/MessagingService.java | 75 ++++++++++---------- 2 files changed, 44 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/71c9209e/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/71c9209e/src/java/org/apache/cassandra/net/MessagingService.java ----------------------------------------------------------------------
