Merge branch 'CAMEL-7512' of https://github.com/kevinearls/camel
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/675bd530 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/675bd530 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/675bd530 Branch: refs/heads/master Commit: 675bd5304a6e7c1ed2a35dedd5550de235e947ad Parents: aef0e59 3f8dcdd Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Jun 16 20:42:05 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Jun 16 20:42:05 2014 +0200 ---------------------------------------------------------------------- .../camel/component/netty/NettyComponent.java | 7 +-- .../component/netty/NettyConfiguration.java | 25 +++++++++ .../camel/component/netty/NettyEndpoint.java | 4 ++ ...ponentConfigurationAndDocumentationTest.java | 57 ++++++++++++++++++++ 4 files changed, 90 insertions(+), 3 deletions(-) ----------------------------------------------------------------------