You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@camel.apache.org by su...@apache.org on 2013/10/30 14:22:00 UTC

[3/3] 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

Merge latests from upstream


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dbe794c3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dbe794c3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dbe794c3

Branch: refs/heads/master
Commit: dbe794c37ed84053eee81e9a97b0b2eef4fc2e89
Parents: 9b96968 0ab6bba
Author: Scott England-Sullivan <su...@apache.org>
Authored: Wed Oct 30 08:21:13 2013 -0500
Committer: Scott England-Sullivan <su...@apache.org>
Committed: Wed Oct 30 08:21:13 2013 -0500

----------------------------------------------------------------------
 .../netty/http/DefaultNettyHttpBinding.java     | 30 +++++++++++++++++---
 .../netty/http/NettyHttpContentTypeTest.java    | 16 +++++++++++
 2 files changed, 42 insertions(+), 4 deletions(-)
----------------------------------------------------------------------