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/326d4f8c Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/326d4f8c Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/326d4f8c Branch: refs/heads/master Commit: 326d4f8ce26471f90105e8d37e1f9fb76d354042 Parents: b13d2e4 c53eb2e Author: Sudheer Vinukonda <[email protected]> Authored: Tue Jan 27 22:23:58 2015 +0000 Committer: Sudheer Vinukonda <[email protected]> Committed: Tue Jan 27 22:23:58 2015 +0000 ---------------------------------------------------------------------- doc/reference/configuration/records.config.en.rst | 4 ++-- iocore/net/UnixNet.cc | 4 ++-- proxy/hdrs/HdrTest.cc | 12 +++++------- 3 files changed, 9 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
