camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject [2/2] camel git commit: Upgrade netty41 to version 4.1.1.Final
Date Wed, 08 Jun 2016 07:43:14 GMT
Upgrade netty41 to version 4.1.1.Final


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

Branch: refs/heads/master
Commit: 1da818fc7faa82fb28b672816814f2750532a7d5
Parents: f9a2d1c
Author: Andrea Cosentino <ancosen@gmail.com>
Authored: Wed Jun 8 09:40:21 2016 +0200
Committer: Andrea Cosentino <ancosen@gmail.com>
Committed: Wed Jun 8 09:40:21 2016 +0200

----------------------------------------------------------------------
 components/camel-etcd/src/main/docs/etcd.adoc | 5 ++++-
 parent/pom.xml                                | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/1da818fc/components/camel-etcd/src/main/docs/etcd.adoc
----------------------------------------------------------------------
diff --git a/components/camel-etcd/src/main/docs/etcd.adoc b/components/camel-etcd/src/main/docs/etcd.adoc
index e7e28b2..08f30c9 100644
--- a/components/camel-etcd/src/main/docs/etcd.adoc
+++ b/components/camel-etcd/src/main/docs/etcd.adoc
@@ -11,8 +11,9 @@
 
 
 
+
 // endpoint options: START
-The etcd component supports 15 endpoint options which are listed below:
+The etcd component supports 16 endpoint options which are listed below:
 
 {% raw %}
 [width="100%",cols="2s,1,1m,1m,5",options="header"]
@@ -21,6 +22,7 @@ The etcd component supports 15 endpoint options which are listed below:
 | namespace | common |  | EtcdNamespace | *Required* The API namespace to use
 | path | common |  | String | The path the enpoint refers to
 | recursive | common | false | boolean | To apply an action recursively.
+| servicePath | common | /services/ | String | The path to look for for service discovery
 | timeout | common |  | Long | To set the maximum time an action could take to complete.
 | uris | common | http://localhost:2379,http://localhost:4001 | String | To set the URIs
the client connects.
 | bridgeErrorHandler | consumer | false | boolean | Allows for bridging the consumer to the
Camel routing Error Handler which mean any exceptions occurred while the consumer is trying
to pickup incoming messages or the likes will now be processed as a message and handled by
the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler
to deal with exceptions that will be logged at WARN/ERROR level and ignored.
@@ -49,6 +51,7 @@ The etcd component supports 15 endpoint options which are listed below:
 
 
 
+
 // component options: START
 The etcd component has no options.
 // component options: END

http://git-wip-us.apache.org/repos/asf/camel/blob/1da818fc/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 89a3178..21b822c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -423,7 +423,7 @@
     <neethi-bundle-version>3.0.1</neethi-bundle-version>
     <netty3-version>3.10.5.Final</netty3-version>
     <netty-version>4.0.37.Final</netty-version>
-    <netty41-version>4.1.0.Final</netty41-version>
+    <netty41-version>4.1.1.Final</netty41-version>
     <noggit-bundle-version>0.5_1</noggit-bundle-version>
     <!-- should be in-sync with deltaspike -->
     <openwebbeans1-version>1.2.7</openwebbeans1-version>


Mime
View raw message