Merge branch 'stable-3.2' into stable-3.3 * stable-3.2: Upgrade bazlets to latest stable-3.2 to build with 3.2.5.1 API Fix plugin's documentation after 8fb718b Upgrade bazlets to latest stable-3.1 to build with 3.1.10 API Change-Id: I0f3d2bca8a2639d488be390f94c73956e02bc667
diff --git a/WORKSPACE b/WORKSPACE index d8f99ec..cdb1696 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -3,7 +3,7 @@ load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "0f81174e3d1b892a1342ebc75bb4bbb158ae0efe", + commit = "cf0bbc90e09a8a1d7c042d79f1555e3fa40984e1", #local_path = "/home/<user>/projects/bazlets", )
diff --git a/src/main/resources/Documentation/config.md b/src/main/resources/Documentation/config.md index 217a5b2..2976de5 100644 --- a/src/main/resources/Documentation/config.md +++ b/src/main/resources/Documentation/config.md
@@ -160,13 +160,6 @@ : The interval of time in milliseconds between the subsequent auto-retries. When not specified, the default value is set to 10000ms. -```index.waitTimeout``` -: Maximum interval of time in milliseconds the plugin waits to acquire the lock for - an indexing call. When not specified, the default value is set to 5000ms. - -NOTE: the default settings for `http.timeout`, `http.maxTries` and `http.lockAcquireTimeout` -ensure that the plugin will keep retrying to forward a message for one hour. - ```cache.synchronize``` : Whether to synchronize cache evictions. Defaults to true. @@ -219,6 +212,9 @@ the lock for an indexing call. When not specified, the default value is set to 5000ms. +NOTE: the default settings for `http.socketTimeout`, `http.maxTries` and `index.waitTimeout` +ensure that the plugin will keep retrying to forward a message for one hour. + ```websession.synchronize``` : Whether to synchronize web sessions. Defaults to true.