Updated Branches: refs/heads/trunk 182a36bc4 -> 6642d0f95
Merge branch 'cassandra-1.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/6642d0f9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6642d0f9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6642d0f9 Branch: refs/heads/trunk Commit: 6642d0f956eadf7ac75cad0a544ceb567dd9a6b6 Parents: 182a36b 212fd41 Author: Peter Schuller <peter.schul...@infidyne.com> Authored: Wed Feb 15 00:40:27 2012 +0100 Committer: Peter Schuller <peter.schul...@infidyne.com> Committed: Wed Feb 15 00:40:27 2012 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/net/MessagingService.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
