You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ff...@apache.org on 2018/11/06 10:43:38 UTC
[camel] 06/06: Merge branch 'master' of github.com:apache/camel
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 79628fe26416e37381d2b5ef28086a9c2d9fc813
Merge: ee7a689 4d04d2a
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Tue Nov 6 18:43:06 2018 +0800
Merge branch 'master' of github.com:apache/camel
.../camel-cache/src/main/docs/cache-component.adoc | 2 +-
.../src/main/docs/consul-component.adoc | 6 +--
.../src/main/docs/disruptor-component.adoc | 4 +-
.../src/main/docs/ehcache-component.adoc | 2 +-
.../org/apache/camel/http/common/CamelServlet.java | 1 -
.../src/main/docs/infinispan-component.adoc | 2 +-
.../src/main/docs/jetty-component.adoc | 2 +-
.../camel-jms/src/main/docs/jms-component.adoc | 2 +-
.../camel-mllp/src/main/docs/mllp-component.adoc | 4 +-
.../src/main/docs/nagios-component.adoc | 2 +-
.../camel-netty/src/main/docs/netty-component.adoc | 10 ++--
.../src/main/docs/netty4-component.adoc | 12 ++---
.../src/main/docs/spring-boot.adoc | 4 +-
.../cloud/CamelCloudConfigurationProperties.java | 2 -
.../boot/CamelAutoConfigurationPropertiesTest.java | 2 +-
...amelAutoConfigurationWithContextRunnerTest.java | 54 ----------------------
.../boot/CamelConfigurationLocationsTest.java | 2 +-
.../camel/spring/boot/CamelEventNotifierTest.java | 2 +-
.../boot/CustomCamelCamelConfigurationTest.java | 2 +-
.../spring/boot/CustomShutdownStrategyTest.java | 2 +-
.../spring/boot/SpringConverterDelegationTest.java | 2 +-
.../camel/spring/boot/issues/RestDslPostTest.java | 2 +-
.../camel/spring/boot/issues/SimpleOgnlTest.java | 2 +-
.../boot/parent/SpringBootRefreshContextTest.java | 5 +-
.../camel-ssh/src/main/docs/ssh-component.adoc | 4 +-
.../src/main/docs/zookeeper-component.adoc | 2 +-
parent/pom.xml | 10 ++--
platforms/spring-boot/spring-boot-dm/pom.xml | 8 ++--
.../maven/bom/generator/BomGeneratorMojo.java | 4 ++
29 files changed, 53 insertions(+), 105 deletions(-)