Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/80601500 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/80601500 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/80601500 Branch: refs/heads/master Commit: 80601500269726c4c25488ea2bf8d830298f27cf Parents: a54b47c bd76377 Author: shinrich <[email protected]> Authored: Mon Oct 5 12:45:45 2015 -0500 Committer: shinrich <[email protected]> Committed: Mon Oct 5 12:45:45 2015 -0500 ---------------------------------------------------------------------- doc/reference/configuration/records.config.en.rst | 3 +-- doc/reference/plugins/header_rewrite.en.rst | 11 +++++------ 2 files changed, 6 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
