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/09/10 17:10:14 UTC

[48/48] git commit: Merge remote-tracking branch 'origin/master' into 5.0.x

Merge remote-tracking branch 'origin/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/d2774942
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d2774942
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d2774942

Branch: refs/heads/5.0.x
Commit: d2774942966500f17691b3feee6f74213829ba1c
Parents: 9aad786 cb9b0ff
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Sep 10 09:01:51 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Sep 10 09:01:51 2013 -0600

----------------------------------------------------------------------
 CHANGES                                         |  36 +++-
 build/xml.m4                                    |  79 +++++++-
 ci/jenkins/jobs.yaml                            |  56 +++---
 configure.ac                                    |   2 +-
 doc/admin/configuring-cache.en.rst              |  48 +++--
 doc/reference/commands/traffic_cop.en.rst       |  28 ++-
 .../configuration/records.config.en.rst         | 179 +++++++++++++------
 .../configuration/storage.config.en.rst         |  37 +++-
 doc/sdk/new-protocol-plugins.en.rst             |  63 ++++---
 iocore/eventsystem/UnixEThread.cc               |   4 +
 iocore/net/UnixNet.cc                           |   5 +
 lib/perl/Makefile.am                            |   3 +
 lib/ts/ink_lockfile.h                           |   4 -
 mgmt/RecordsConfig.cc                           |  14 +-
 mgmt/cli/ConfigCmd.cc                           |   9 +-
 mgmt/cli/ConfigCmd.h                            |   3 +-
 mgmt/cli/ShowCmd.cc                             |   9 +-
 mgmt/cli/cli_detailed_command_list.txt          |   6 +-
 mgmt/cluster/ClusterCom.cc                      |  10 +-
 mgmt/cluster/ClusterCom.h                       |   2 +
 mgmt/stats/StatProcessor.cc                     |  30 +++-
 mgmt/stats/StatProcessor.h                      |   8 +
 mgmt/stats/StatType.cc                          |   7 +
 mgmt/utils/XmlUtils.cc                          |  61 ++++++-
 plugins/experimental/healthchecks/README        |   4 +-
 .../experimental/healthchecks/healthchecks.c    |  46 +++--
 plugins/regex_remap/README                      |   1 +
 plugins/regex_remap/regex_remap.cc              |  19 +-
 proxy/InkAPI.cc                                 |   8 +-
 proxy/InkAPIInternal.h                          |  95 +++++++---
 proxy/api/ts/experimental.h                     |   5 +-
 proxy/config/records.config.default.in          |  29 ++-
 proxy/http/HttpConfig.cc                        |   8 +-
 proxy/http/HttpConfig.h                         |   9 +-
 proxy/http/HttpSM.cc                            |  39 +---
 proxy/http/HttpTransact.cc                      |  37 ++--
 proxy/http/HttpTransact.h                       |   2 -
 proxy/http/HttpTunnel.cc                        |   2 +-
 38 files changed, 702 insertions(+), 305 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d2774942/CHANGES
----------------------------------------------------------------------
diff --cc CHANGES
index 03d1713,868829d..3d1f7a7
--- a/CHANGES
+++ b/CHANGES
@@@ -1,18 -1,36 +1,42 @@@
                                                           -*- 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-2173] RECD_COUNTER type is missing in setTokenValue()
  
-   *) [TS-2165] Introduce cluster-wide logging stats
+   *) [TS-1637] Fix nodes as idle/dead if we have not heard from them in awhile
+ 
+   *) [TS-2185] Support to control ClusterCom::sendSharedData frequency.
+ 
+   *) [TS-2195] Deprecate experimental TSHttpTxnCacheLookupSkip API.
+ 
+   *) [TS-2176] Do not reset value of api_skip_cache_lookup when reading it.
+     Author: Corey Cossentino <co...@omniti.com>
+ 
+   *) [TS-2191] Do not reschedule http_sm when the sm_list`s lock is not
+    acquired. This can lose items for the WebUI, which will be fixed in a
+    separate bug.
+ 
+   *) [TS-2188] Fixes to make healthcheck plugin not segfault, and parse the
+    log files properly. Author: Scott Harris <sc...@harrisnet.id.au>.
+ 
+   *) [TS-1086] Avoid edge case returning 304 to an unconditional request.
+      Diagnosis and patch by Mohamad Khateeb.
+ 
+   *) [TS-2168] Make RecordsConfig.cc more inline with default builds.
+ 
+   *) [TS-2174] traffic_shell/traffic_line miss some stats value
+ 
+   *) [TS-2173] RECD_COUNTER type is missing in setTokenValue().
+ 
+   *) [TS-2165] Introduce cluster-wide logging stats.
  
    *) [TS-2167] Update apichecker.pl to give suggestions on additional
-    deprecated APIs
+    deprecated APIs.
  
    *) [TS-2163] Remove WDA_BILLING, ACC_ALARMS etc. code and definitions.
  

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d2774942/proxy/http/HttpSM.cc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d2774942/proxy/http/HttpTransact.h
----------------------------------------------------------------------