You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2013/07/22 17:28:41 UTC

git commit: doc: remove stale connection collapsing docs

Updated Branches:
  refs/heads/master 0fb16ad81 -> b16a3ac1f


doc: remove stale connection collapsing docs

Connection collapsing was removed in TS-489, commit
dc33143ad63f9e6baff08697959572ad777e7008.


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

Branch: refs/heads/master
Commit: b16a3ac1fa3cbb56caee6d0f27c7c8b3405d92dc
Parents: 0fb16ad
Author: James Peach <jp...@apache.org>
Authored: Mon Jul 22 08:27:33 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Mon Jul 22 08:28:28 2013 -0700

----------------------------------------------------------------------
 .../configuration-files/records.config.en.rst   | 30 ++------------------
 1 file changed, 2 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b16a3ac1/doc/admin/configuration-files/records.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/configuration-files/records.config.en.rst b/doc/admin/configuration-files/records.config.en.rst
index a3295fe..b19cb29 100644
--- a/doc/admin/configuration-files/records.config.en.rst
+++ b/doc/admin/configuration-files/records.config.en.rst
@@ -1191,8 +1191,7 @@ Cache Control
     Reloadable.
     Enables (``1``) or disables (``0``) ability to a read cached object
     while the another connection is completing the write to cache for
-    the same object. This must be enabled for connection collapsing to
-    work
+    the same object.
 
 ``proxy.config.cache.force_sector_size``
 {#proxy.config.cache.force_sector_size}
@@ -1337,32 +1336,7 @@ Cache Control
     Default: ``0``
     Enables (``1``) or disables (``0``) the ability to read a cached
     object while another connection is completing a write to cache for
-    the same object. If you want connection collapsing to work, then
-    this option must be enabled.
-
-``proxy.config.connection_collapsing.hashtable_enabled``
-{#proxy.config.connection_collapsing.hashtable_enabled}
-    ``INT``
-    Default: ``0``
-    Enables (``1``) or disables (``0``) whether requests will first
-    search the hashtable to see if another similar request is already
-    being served.
-
-``proxy.config.connection_collapsing.rww_wait_time``
-{#proxy.config.connection_collapsing.rww_wait_time}
-    ``INT``
-    Default: ``0``
-    When enabled (``1``) while the write configuration parameter is also
-    enabled, secondary clients will wait this amount of time (in msec)
-    before cache lookup is retried.
-
-``proxy.config.connection_collapsing.revalidate_window_period``
-{#proxy.config.connection_collapsing.revalidate_window_period}
-    ``INT``
-    Default: ``0``
-    The amount of time (msec) secondary clients for the same URL will be
-    served the stale object when revalidation of a cached object is in
-    progress.
+    the same object.
 
 ``proxy.config.http.cache.fuzz.min_time``
 {#proxy.config.http.cache.fuzz.min_time}