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 2013/10/06 16:58:07 UTC
[22/22] git commit: Merge branch 'master' into 5.0.x
Merge branch 'master' into 5.0.x
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/15d4fb8d
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/15d4fb8d
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/15d4fb8d
Branch: refs/heads/5.0.x
Commit: 15d4fb8d54615ee5ebb4af405b013944ce0401ab
Parents: 4ab334d 196cd66
Author: Leif Hedstrom <zw...@apache.org>
Authored: Sun Oct 6 08:57:17 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Sun Oct 6 08:57:17 2013 -0600
----------------------------------------------------------------------
CHANGES | 45 +++++++---
doc/admin/http-proxy-caching.en.rst | 64 +++++++++++++-
doc/admin/reverse-proxy-http-redirects.en.rst | 3 +-
.../configuration/records.config.en.rst | 54 +++++++-----
iocore/cache/CacheWrite.cc | 1 +
lib/ts/ink_cap.cc | 81 ++++++++++++++++-
lib/ts/ink_cap.h | 47 ++++++++++
lib/ts/ink_queue.cc | 18 ++--
lib/ts/ink_queue.h | 4 +-
lib/ts/ink_queue_ext.cc | 15 ++--
lib/ts/ink_queue_ext.h | 4 +-
mgmt/LocalManager.cc | 65 +-------------
mgmt/LocalManager.h | 6 --
mgmt/RecordsConfig.cc | 3 +
mgmt/Rollback.cc | 2 +-
plugins/experimental/healthchecks/README | 6 +-
.../experimental/healthchecks/healthchecks.c | 93 +++++++++++---------
proxy/Plugin.cc | 10 ++-
proxy/config/logs_xml.config.default | 8 ++
proxy/http/remap/UrlMapping.cc | 11 ++-
proxy/http/remap/UrlRewrite.cc | 28 ++++--
proxy/logging/Log.cc | 2 +-
proxy/logging/LogBufferSink.h | 4 +-
proxy/logging/LogCollationClientSM.cc | 8 +-
proxy/logging/LogCollationClientSM.h | 1 +
proxy/logging/LogConfig.cc | 29 ++++--
proxy/logging/LogFile.cc | 15 ++--
proxy/logging/LogFile.h | 2 +-
proxy/logging/LogHost.cc | 31 +++++--
proxy/logging/LogHost.h | 5 +-
proxy/logging/LogObject.cc | 2 +-
proxy/logging/LogObject.h | 1 -
32 files changed, 447 insertions(+), 221 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/15d4fb8d/CHANGES
----------------------------------------------------------------------
diff --cc CHANGES
index 85e5487,cf1bff2..4e60198
--- a/CHANGES
+++ b/CHANGES
@@@ -1,17 -1,26 +1,32 @@@
-*- coding: utf-8 -*-
+Changes with Apache Traffic Server 5.0.0
+
+ *) [TS-1919] Eliminate CacheLookupHttpConfig. This breaks cluster
+ compatibility, so all cluster nodes should be upgraded simultaneously.
+
+
Changes with Apache Traffic Server 4.1.0
- *) TS-2232: log level should be change from Status to Debug.
+ *) [TS-2261] Add config option to restore/elevate access to reading files by
+ root when loading plugins
+
+ *) [TS-2257] Healthcheck plugin can stop watching some events.
+
+ *) [TS-2260] Avoid flooding log when log host is down.
+
+ *) [TS-2259] Introduce failover hosts for logging system.
+
+ *) [TS-2256] Mem stats info is bad when enable reclaimable-freelist.
+
+ *) [TS-2255] TS should not flood printing after log space reach the limit.
+
+ *) [TS-2245] cancel the trigger of CacheVC in openWriteCloseDataDone.
+
+ *) [TS-2232] log level should be change from Status to Debug.
Author: Yu Qing <zh...@taobao.com>
- *) [TS-2201] split drainIncomingChannel two thread, one handle Broadcast message and other handle Reliable(TCP)
- request for supporing large cluster.
+ *) [TS-2201] split drainIncomingChannel two thread, one handle Broadcast
+ message and other handle Reliable(TCP) request for supporing large cluster.
*) [TS-2144] Avoid race on e.g. "traffic_server -Cclear" which would crash
the process intermittently.