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/04 04:27:25 UTC

[21/21] git commit: Merge branch 'master' into 5.0.x

Merge branch 'master' into 5.0.x

* master:
  ci: test make distclean in jenkins
  ci: fix debug jobs for centos5
  TS-2174: Fix StatBinaryEval() on div operation
  TS-2173: RECD_COUNTER type is missing in setTokenValue()
  TS-2172: automake subdir-objects requires AM_PROG_CC_C_O
  sdk docs: fix links & formatting in preface
  TS-2172: Explicitly use subdir-objects in automake init
  doc: minor formatting fixes
  TS-2165: Introduce cluster-wide logging stats
  finishing up the cleanup of the admin guide
  ci: shrink builders pollng period
  ci: fix experimental tag substitution
  Fix the 4.0.1 relase
  added TS-2167
  TS-2167: Update apichecker.pl to give suggestions on additional deprecated APIs
  Doc: Add transaction buffering control.
  ci: build experimental configuration options
  ci: reduce the number of job templates
  Add debug builds for 3.2.x and 4.0.x in the CI
  Fix git paths for the 4.0.x branch in Jenkins


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/9aad786e
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/9aad786e
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/9aad786e

Branch: refs/heads/5.0.x
Commit: 9aad786e82fc13c17fce88959a4cfc80286212f1
Parents: a75ebb6 b450c84
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Sep 3 20:26:52 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Sep 3 20:26:52 2013 -0600

----------------------------------------------------------------------
 CHANGES                                         |   7 +
 STATUS                                          |   2 +-
 ci/jenkins/jobs.yaml                            | 535 ++++++++++++++-----
 configure.ac                                    |   3 +-
 doc/admin/event-logging-formats.en.rst          |  10 +-
 doc/admin/faqs.en.rst                           | 105 ++--
 doc/admin/http-proxy-caching.en.rst             |  80 ++-
 doc/admin/traffic-server-error-messages.en.rst  | 155 +++---
 doc/admin/working-log-files.en.rst              |  49 +-
 doc/admin/working-log-files/log-formats.en.rst  |   4 +-
 doc/glossary.en.rst                             |   5 +
 .../api/TSHttpOverridableConfig.en.rst          |  70 +++
 doc/reference/api/TSLifecycleHookAdd.en.rst     |  28 +-
 doc/reference/api/TSTypes.en.rst                |  16 +-
 doc/reference/api/index.en.rst                  |   1 +
 .../configuration/logs_xml.config.en.rst        |   2 +
 .../configuration/records.config.en.rst         |  42 +-
 doc/sdk/getting-started.en.rst                  |   2 +
 doc/sdk/header-based-plugin-examples.en.rst     |   2 +
 .../how-to-create-trafficserver-plugins.en.rst  |   2 +
 doc/sdk/http-transformation-plugin.en.rst       |   8 +-
 doc/sdk/index.en.rst                            |   4 +
 doc/sdk/new-protocol-plugins.en.rst             |   2 +
 doc/sdk/preface.en.rst                          |  16 +-
 mgmt/RecordsConfig.cc                           | 110 ++++
 mgmt/stats/StatType.cc                          |  17 +
 proxy/config/stats.config.xml.default           | 156 ++++++
 proxy/logging/Log.cc                            |  16 +-
 proxy/logging/LogConfig.cc                      |  24 +-
 proxy/logging/LogConfig.h                       |   6 +
 proxy/logging/LogFile.cc                        |  11 +-
 proxy/logging/LogHost.cc                        |   8 +
 proxy/logging/LogObject.cc                      |   3 +
 tools/apichecker.pl                             | 179 ++++++-
 34 files changed, 1296 insertions(+), 384 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9aad786e/CHANGES
----------------------------------------------------------------------
diff --cc CHANGES
index 920a2c4,455bdcf..03d1713
--- a/CHANGES
+++ b/CHANGES
@@@ -1,12 -1,13 +1,19 @@@
                                                           -*- 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-2167] Update apichecker.pl to give suggestions on additional
+    deprecated APIs
+ 
    *) [TS-2163] Remove WDA_BILLING, ACC_ALARMS etc. code and definitions.
  
    *) [TS-2156] Fix stats trap in different type of threads