Merge commit 'aca56694ec162b9c4914c466545eedd9d8b645f5' into ts-3683
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/da043622 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/da043622 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/da043622 Branch: refs/heads/master Commit: da04362227ef91b27aa7d02e9238f1ceae68689d Parents: f3e1366 aca5669 Author: shinrich <[email protected]> Authored: Wed Jul 8 07:06:25 2015 -0500 Committer: shinrich <[email protected]> Committed: Wed Jul 8 07:06:25 2015 -0500 ---------------------------------------------------------------------- doc/admin/event-logging-formats.en.rst | 4 +-- .../api/TSNetVConnSSLCachedHitSet.en.rst | 32 -------------------- 2 files changed, 2 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/da043622/doc/admin/event-logging-formats.en.rst ----------------------------------------------------------------------
