You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/06/13 14:04:53 UTC
[4/4] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/camel
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/camel
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0cad912e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0cad912e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0cad912e
Branch: refs/heads/master
Commit: 0cad912e0bd04ece2f97184ae6236303adade1e1
Parents: 55901ba 011002f
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jun 13 14:04:27 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jun 13 14:04:27 2013 +0200
----------------------------------------------------------------------
.../component/netty/http/NettyHttpEndpoint.java | 9 +++----
.../component/netty/http/NettyHttpSSLTest.java | 16 +++++++++++-
.../camel/component/netty/NettyConstants.java | 1 +
.../camel/component/netty/NettyEndpoint.java | 27 +++++++++++++++++---
.../camel/component/netty/NettySSLTest.java | 9 ++++++-
5 files changed, 50 insertions(+), 12 deletions(-)
----------------------------------------------------------------------