You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2015/07/31 04:14:05 UTC
[9/9] trafficserver git commit: Merge branch 'master' into 6.0.x
Merge branch 'master' into 6.0.x
* master:
TS-3807: Remove legacy log splitting code and docs.
TS-3749: Re-enable error log.
TS-3492 Only send SETTINGS which are different than protocol defaults
TS-3766 Ignore unknown frame in debugging
[TS-3476] Add a log tag for application protocol (add docs)
Revert "TS-3752: Problem with larger headers and HTTP/2"
TS-3800: Fix bug in hostdb ui related to missing query
TS-3803: CID 1313322 CID 1313322: HostDB memory issues (introduced in TS-3800)
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f0e395f5
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f0e395f5
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f0e395f5
Branch: refs/heads/6.0.x
Commit: f0e395f598ee6f4bc5c69db5ac9186a9c2f77787
Parents: 8aba181 6d37b7c
Author: Leif Hedstrom <zw...@apache.org>
Authored: Thu Jul 30 20:13:46 2015 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Thu Jul 30 20:13:46 2015 -0600
----------------------------------------------------------------------
doc/admin/event-logging-formats.en.rst | 5 +
doc/admin/working-log-files.en.rst | 13 --
.../LC_MESSAGES/admin/working-log-files.en.po | 8 -
.../configuration/records.config.en.rst | 15 --
iocore/hostdb/HostDB.cc | 18 +-
lib/perl/lib/Apache/TS/AdminClient.pm | 2 -
mgmt/RecordsConfig.cc | 4 -
proxy/http2/HTTP2.cc | 9 +-
proxy/http2/HTTP2.h | 2 +-
proxy/http2/Http2ConnectionState.cc | 61 +++++--
proxy/http2/Http2ConnectionState.h | 4 +-
proxy/logging/LogConfig.cc | 180 +++----------------
proxy/logging/LogConfig.h | 6 +-
tools/traffic_shell.pl | 7 -
14 files changed, 95 insertions(+), 239 deletions(-)
----------------------------------------------------------------------