Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/08721da2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/08721da2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/08721da2 Branch: refs/heads/trunk Commit: 08721da28d148b1825d7252d71955eacd211abd3 Parents: 5d2d07f 87d9362 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Mar 20 11:39:54 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Mar 20 11:39:54 2013 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/net/MessagingService.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/08721da2/src/java/org/apache/cassandra/net/MessagingService.java ----------------------------------------------------------------------
