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/183d642c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/183d642c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/183d642c Branch: refs/heads/master Commit: 183d642c54907a53de44ed54d39b0b4c4d95760a Parents: 441bf37 716928c Author: Freeman Fang <freeman.f...@gmail.com> Authored: Tue Aug 22 14:40:52 2017 +0800 Committer: Freeman Fang <freeman.f...@gmail.com> Committed: Tue Aug 22 14:40:52 2017 +0800 ---------------------------------------------------------------------- .../apache/camel/component/ahc/AhcProducer.java | 2 +- .../component/couchbase/CouchbaseConsumer.java | 3 ++ .../component/couchbase/CouchbaseProducer.java | 8 ++++ .../main/docs/hazelcast-queue-component.adoc | 40 +++++++++++++++++++- .../component/hazelcast/HazelcastOperation.java | 1 + .../hazelcast/queue/HazelcastQueueProducer.java | 20 +++++++++- .../hazelcast/HazelcastQueueProducerTest.java | 23 +++++++++++ .../src/main/docs/nagios-component.adoc | 3 +- .../component/nagios/NagiosConfiguration.java | 35 +++++++++-------- .../component/restlet/MethodBasedRouter.java | 6 ++- .../component/restlet/RestletComponent.java | 26 +++++++------ .../restlet/RestRestletHttpOptionsTest.java | 5 +-- parent/pom.xml | 16 ++++---- .../NagiosComponentConfiguration.java | 18 +++++++++ 14 files changed, 161 insertions(+), 45 deletions(-) ----------------------------------------------------------------------
