Repository: camel
Updated Branches:
  refs/heads/master 541114c17 -> e2fea5f23


Upgrade Jetty to version 9.2.19.v20160908 (memory leaks fix)


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

Branch: refs/heads/master
Commit: e2fea5f237b1b848339422298c08681c8f2083a0
Parents: 541114c
Author: Andrea Cosentino <anco...@gmail.com>
Authored: Mon Sep 19 09:33:09 2016 +0200
Committer: Andrea Cosentino <anco...@gmail.com>
Committed: Mon Sep 19 10:15:56 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/e2fea5f2/components/camel-solr/src/main/docs/solr-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-solr/src/main/docs/solr-component.adoc 
b/components/camel-solr/src/main/docs/solr-component.adoc
index c2a6916..0be1bb4 100644
--- a/components/camel-solr/src/main/docs/solr-component.adoc
+++ b/components/camel-solr/src/main/docs/solr-component.adoc
@@ -46,7 +46,7 @@ The Solr component has no options.
 
 
 // endpoint options: START
-The Solr component supports 15 endpoint options which are listed below:
+The Solr component supports 14 endpoint options which are listed below:
 
 {% raw %}
 [width="100%",cols="2,1,1m,1m,5",options="header"]
@@ -63,7 +63,6 @@ The Solr component supports 15 endpoint options which are 
listed below:
 | soTimeout | producer |  | Integer | Read timeout on the underlying 
HttpConnectionManager. This is desirable for queries but probably not for 
indexing
 | streamingQueueSize | producer | 10 | int | Set the queue size for the 
StreamingUpdateSolrServer
 | streamingThreadCount | producer | 2 | int | Set the number of threads for 
the StreamingUpdateSolrServer
-| exchangePattern | advanced | InOnly | ExchangePattern | Sets the default 
exchange pattern when creating an exchange
 | synchronous | advanced | false | boolean | Sets whether synchronous 
processing should be strictly used or Camel is allowed to use asynchronous 
processing (if supported).
 | collection | solrCloud |  | String | Set the collection name which the 
solrCloud server could use
 | zkHost | solrCloud |  | String | Set the ZooKeeper host information which 
the solrCloud could use such as zkhost=localhost:8123.

http://git-wip-us.apache.org/repos/asf/camel/blob/e2fea5f2/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index c010d8c..5a22f16 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -320,7 +320,7 @@
     <jedis-client-bundle-version>2.8.1_1</jedis-client-bundle-version>
     <jersey-version>2.11</jersey-version>
     <jetty6-bundle-version>6.1.26_4</jetty6-bundle-version>
-    <jetty9-version>9.2.17.v20160517</jetty9-version>
+    <jetty9-version>9.2.19.v20160908</jetty9-version>
     <jetty-version>${jetty9-version}</jetty-version>
     <jetty-plugin-version>${jetty-version}</jetty-plugin-version>
     <jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId>

Reply via email to