Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/kafka into trunk
Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/5b80758b Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/5b80758b Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/5b80758b Branch: refs/heads/trunk Commit: 5b80758b57d8063b8a8124562cc5c83854a99e00 Parents: 5de68ef 3955915 Author: Sriram Subramanian <[email protected]> Authored: Tue Feb 25 00:22:04 2014 -0800 Committer: Sriram Subramanian <[email protected]> Committed: Tue Feb 25 00:22:04 2014 -0800 ---------------------------------------------------------------------- .../main/scala/kafka/network/SocketServer.scala | 16 +++++++-- .../unit/kafka/network/SocketServerTest.scala | 38 +++++++++----------- 2 files changed, 31 insertions(+), 23 deletions(-) ----------------------------------------------------------------------
