You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2014/03/08 15:46:27 UTC

[15/18] git commit: Added missing traffic_cop configuration.

Added missing traffic_cop configuration.


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

Branch: refs/heads/master
Commit: dc148b58e9878a2ebc81bb8540088b7d39bb73bd
Parents: 6d369c9
Author: Leif Hedstrom <zw...@apache.org>
Authored: Sat Mar 8 00:56:39 2014 +0000
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Sat Mar 8 07:45:50 2014 -0700

----------------------------------------------------------------------
 doc/reference/configuration/records.config.en.rst | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dc148b58/doc/reference/configuration/records.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/configuration/records.config.en.rst b/doc/reference/configuration/records.config.en.rst
index 1e397df..5f53b27 100644
--- a/doc/reference/configuration/records.config.en.rst
+++ b/doc/reference/configuration/records.config.en.rst
@@ -193,10 +193,18 @@ otherwise, Traffic Server uses the Traffic Server user account name as the defau
 
 A value of ``0`` means no signal will be sent.
 
+.. ts:cv:: CONFIG proxy.config.cop.linux_min_memfree_kb INT 10240
+
+   The minimum amount of free memory space allowed before Traffic Server stops
+   the :program:`traffic_server` and :program:`traffic_manager` processes to 
+   prevent the system from hanging.
+
 .. ts:cv:: CONFIG proxy.config.cop.linux_min_swapfree_kb INT 10240
 
-   The minimum amount of free swap space allowed before Traffic Server stops the :program:`traffic_server` and :program:`traffic_manager` processes to
-   prevent the system from hanging. This configuration variable applies if swap is enabled in Linux 2.2 only.
+   The minimum amount of free swap space allowed before Traffic Server stops
+   the :program:`traffic_server` and :program:`traffic_manager` processes to 
+   prevent the system from hanging. This configuration variable applies if
+   swap is enabled in Linux 2.2 only. 
 
 .. ts:cv:: CONFIG proxy.config.output.logfile  STRING traffic.out