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/148b4745 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/148b4745 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/148b4745 Branch: refs/heads/master Commit: 148b4745548c3c495a7ce151dd5e40b542ad38f4 Parents: 3c3bd8b faf38a5 Author: Brian Geffon <[email protected]> Authored: Thu Mar 6 15:18:20 2014 -0800 Committer: Brian Geffon <[email protected]> Committed: Thu Mar 6 15:18:20 2014 -0800 ---------------------------------------------------------------------- doc/arch/cache/cache-arch.en.rst | 10 +++++----- doc/reference/configuration/records.config.en.rst | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
