Merge branch 'netty' of https://github.com/ssogabe/camel
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e79c3aea Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e79c3aea Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e79c3aea Branch: refs/heads/master Commit: e79c3aeac588845270b847535141b282a3317e89 Parents: c5adfe6 1af2b8c Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Jul 29 08:48:45 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Jul 29 08:48:45 2014 +0200 ---------------------------------------------------------------------- .../apache/camel/component/netty/ClientPipelineFactory.java | 2 +- .../apache/camel/component/netty/ServerPipelineFactory.java | 6 +++--- .../camel/component/netty/handlers/ServerChannelHandler.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) ----------------------------------------------------------------------