GitHub user JYBESSON opened a pull request:
https://github.com/apache/camel/pull/1155
CAMEL-10284 No shutdown for custom workerPool in NettyProducer
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/JYBESSON/camel master
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/camel/pull/1155.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #1155
----
commit 0e57b837dfbd2d9e171ceb4be0a84965748abfe9
Author: Jean-Yves BESSON <jean-yves.bes...@external.partecis.eu>
Date: 2016-07-28T15:14:55Z
CAMEL-10184 - Allow to use a custom ChannelGroup for NettyProducer
commit 51eef2f25756d64e40a873eba2a6cc3ed6d95eef
Author: Jean-Yves BESSON <jean-yves.bes...@external.partecis.eu>
Date: 2016-09-02T14:27:50Z
CAMEL-10284 - No shutdown for custom workerPool in NettyProducer
commit d766c9cd03ec37fd915f216c3910920e0ea36c40
Author: Jean-Yves BESSON <jean-yves.bes...@external.partecis.eu>
Date: 2016-09-02T15:07:46Z
Merge remote-tracking branch 'upstream/master'
Conflicts:
components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyProducer.java
commit 9375ccd009d867ece62ab56854dc56fb5e039cd3
Author: Jean-Yves BESSON <jean-yves.bes...@external.partecis.eu>
Date: 2016-09-02T15:14:10Z
Merge remote-tracking branch 'upstream/master'
commit c33ea1245ddd265fbd10bef65208269d16288bf1
Author: Jean-Yves BESSON <jean-yves.bes...@external.partecis.eu>
Date: 2016-09-02T15:26:08Z
fix merge mistake
commit 78e7a54cb24cb3e8dd84991b02ea14aa79a050ca
Author: Jean-Yves BESSON <jean-yves.bes...@external.partecis.eu>
Date: 2016-09-02T15:30:52Z
Fixed CS
commit 4c234ca8c8b1f97a098480d688d71fa0c2d825ae
Author: Jean-Yves BESSON <jean-yves.bes...@external.partecis.eu>
Date: 2016-09-05T07:29:17Z
Fixed merge error
commit bfaa7465802c9f65cee1ffb9b39d7ad7972826e3
Author: Jean-Yves BESSON <jean-yves.bes...@external.partecis.eu>
Date: 2016-09-05T07:32:59Z
Revert "Fixed merge error"
This reverts commit 4c234ca8c8b1f97a098480d688d71fa0c2d825ae.
commit ab867e1c218e2494f2412b47e0b9a390b6bbdc8e
Author: Jean-Yves BESSON <jean-yves.bes...@external.partecis.eu>
Date: 2016-09-05T08:07:49Z
Fixed merge error
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
