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 2014/07/20 09:26:33 UTC

[2/5] git commit: Merge branch 'master' into CAMEL-7611

Merge branch 'master' into CAMEL-7611


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

Branch: refs/heads/master
Commit: fa7e7733c8669c9708f7e41b0d9998a8ab48f98e
Parents: d3a587f d647642
Author: nkukhar <ku...@gmail.com>
Authored: Fri Jul 18 19:17:53 2014 -0700
Committer: nkukhar <ku...@gmail.com>
Committed: Fri Jul 18 19:17:53 2014 -0700

----------------------------------------------------------------------
 .../apache/camel/component/netty/NettyClientBossPoolBuilder.java | 2 +-
 .../apache/camel/component/netty/NettyServerBossPoolBuilder.java | 2 +-
 .../camel/component/netty/UnsharableCodecsConflicts2Test.java    | 4 +---
 .../camel/component/netty/UnsharableCodecsConflictsTest.java     | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------