You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by sh...@apache.org on 2015/07/08 14:25:41 UTC
[7/8] trafficserver git commit: Merge commit
'0413469cfa982308779807ed7ba72f69348c3d93' into ts-3683
Merge commit '0413469cfa982308779807ed7ba72f69348c3d93' 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/f3e13664
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f3e13664
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f3e13664
Branch: refs/heads/master
Commit: f3e13664ab20f60cb4bd2ffef1eb7d6a374a1698
Parents: 5a4350e 0413469
Author: shinrich <sh...@yahoo-inc.com>
Authored: Wed Jul 8 07:05:55 2015 -0500
Committer: shinrich <sh...@yahoo-inc.com>
Committed: Wed Jul 8 07:05:55 2015 -0500
----------------------------------------------------------------------
doc/admin/event-logging-formats.en.rst | 6 ++++++
doc/reference/api/TSNetVConnSSLCachedHitSet.en.rst | 2 +-
proxy/http/HttpSM.cc | 10 ++++++----
proxy/http/HttpSM.h | 1 +
proxy/logging/Log.cc | 5 +++++
proxy/logging/LogAccess.cc | 9 +++++++++
proxy/logging/LogAccess.h | 1 +
proxy/logging/LogAccessHttp.cc | 14 ++++++++++++++
proxy/logging/LogAccessHttp.h | 1 +
9 files changed, 44 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f3e13664/doc/admin/event-logging-formats.en.rst
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f3e13664/proxy/http/HttpSM.cc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f3e13664/proxy/logging/Log.cc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f3e13664/proxy/logging/LogAccess.cc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f3e13664/proxy/logging/LogAccess.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f3e13664/proxy/logging/LogAccessHttp.cc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f3e13664/proxy/logging/LogAccessHttp.h
----------------------------------------------------------------------