You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by so...@apache.org on 2015/06/13 05:44:34 UTC
[2/3] trafficserver git commit: TS-667: Add to CHANGES and minor
cleanup
TS-667: Add to CHANGES and minor cleanup
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/27768402
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/27768402
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/27768402
Branch: refs/heads/master
Commit: 27768402978468ad51b7dee57e1097824e213188
Parents: 5cc4ae8
Author: Phil Sorber <so...@apache.org>
Authored: Fri Jun 12 21:36:00 2015 -0600
Committer: Phil Sorber <so...@apache.org>
Committed: Fri Jun 12 21:36:00 2015 -0600
----------------------------------------------------------------------
CHANGES | 2 ++
doc/reference/configuration/storage.config.en.rst | 6 ++++--
proxy/config/storage.config.default.in | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/27768402/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index e6720b7..8503ad3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 6.0.0
+ *) [TS-667] Update docs to explain how to use alternate disk paths.
+
*) [TS-3455]: Fix debug assert in parent proxy scenario.
*) [TS-3126]: Remove the config setting that controls sending of HTTP status
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/27768402/doc/reference/configuration/storage.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/configuration/storage.config.en.rst b/doc/reference/configuration/storage.config.en.rst
index 5220c46..1c958ba 100644
--- a/doc/reference/configuration/storage.config.en.rst
+++ b/doc/reference/configuration/storage.config.en.rst
@@ -137,9 +137,11 @@ Linux Example
directory structure. As noted for the :ref:`assignment-table` the path used for the disk can effect
the cache if it changes. This can be ameloriated in some cases by using one of the alternate paths
in via ``/dev/disk``. Note that if the ``by-id`` or ``by-path`` style is used, replacing a failed drive will cause
- that path to change because the new drive will have a different physical ID or path. The original hash string can be kept by adding :arg:`id` or :arg:`path` with the original path to the storage line.
+ that path to change because the new drive will have a different physical ID or path. The original hash string can
+ be kept by adding :arg:`id` or :arg:`path` with the original path to the storage line.
- If this is not sufficient then the :arg:`id` or :arg:`path` argument should be used to create a more permanent assignment table. An example would be::
+ If this is not sufficient then the :arg:`id` or :arg:`path` argument should be used to create a more permanent
+ assignment table. An example would be::
/dev/sde id=cache.disk.0
/dev/sdg id=cache.disk.1
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/27768402/proxy/config/storage.config.default.in
----------------------------------------------------------------------
diff --git a/proxy/config/storage.config.default.in b/proxy/config/storage.config.default.in
index 937fe50..23b547e 100644
--- a/proxy/config/storage.config.default.in
+++ b/proxy/config/storage.config.default.in
@@ -32,7 +32,7 @@
#
# Examples: Using O_DIRECT on disks (Linux kernel >= 2.6.3,
# FreeBSD > 5.3)
-#
+#
# /dev/disc/by-id/[Insert_ID_Here_12345] # Linux
# /dev/disc/by-path/[Insert-Path-Here:12:34:56-1.0.0.0] # Linux
#