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 2018/01/06 07:11:56 UTC
[trafficserver] 01/01: Merge branch 'master' into quic-latest
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch quic-latest
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit e653a773eb3efda2732b893f2b4f8c392808cd7b
Merge: 5097235 00d35d7
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Sat Jan 6 00:10:08 2018 -0700
Merge branch 'master' into quic-latest
* master:
clang-format cleanup
Fix compiler issue with ubuntu
Remove use of netstat in tests
Add fix to select ports better on the Mac based on PR 2832
MADV_DODUMP
Restructured traffic_layout and command line
handle transport of empty body response
fix ts_lua core dump issue during config reload
Modify regex_revalidate so that traffic_ctl may be used to trigger config file updates and add a config parameter to disable timed updates if desired.
Cleans up the build, excludes ccache where it fails
Conflicts:
cmd/traffic_layout/traffic_layout.cc
ci/jenkins/bin/build.sh | 25 +-
ci/jenkins/bin/github.sh | 23 +-
ci/jenkins/bin/in_tree.sh | 1 -
ci/jenkins/bin/out_of_tree.sh | 1 -
ci/jenkins/bin/snapshot.sh | 3 +-
cmd/traffic_layout/Makefile.am | 4 +-
cmd/traffic_layout/engine.cc | 376 +++++++++++++++------
cmd/traffic_layout/engine.h | 32 +-
cmd/traffic_layout/file_system.cc | 45 ++-
cmd/traffic_layout/file_system.h | 3 +
cmd/traffic_layout/{traffic_layout.cc => info.cc} | 135 +-------
lib/ts/runroot.h => cmd/traffic_layout/info.h | 17 +-
cmd/traffic_layout/traffic_layout.cc | 276 +++++----------
doc/admin-guide/plugins/regex_revalidate.en.rst | 17 +-
doc/appendices/command-line/traffic_layout.en.rst | 43 ++-
lib/ts/I_Layout.h | 7 -
lib/ts/Layout.cc | 85 +----
lib/ts/ink_queue.cc | 10 +
lib/ts/runroot.cc | 60 +++-
lib/ts/runroot.h | 9 +-
plugins/experimental/ts_lua/ts_lua.c | 4 +-
plugins/experimental/ts_lua/ts_lua_transform.c | 98 ++++--
plugins/experimental/ts_lua/ts_lua_util.c | 4 +-
plugins/regex_revalidate/regex_revalidate.c | 25 +-
tests/gold_tests/autest-site/init.cli.ext | 2 +-
tests/gold_tests/autest-site/ports.py | 19 +-
tests/gold_tests/basic/runroot-layout.test.py | 42 +--
tests/gold_tests/headers/forwarded.test.py | 15 +-
tests/gold_tests/headers/normalize_ae.test.py | 22 +-
tests/gold_tests/headers/via.test.py | 14 +-
tests/gold_tests/logging/ccid_ctid.test.py | 13 +-
tests/gold_tests/pluginTest/gzip/gzip.test.py | 18 +-
.../gold_tests/pluginTest/url_sig/url_sig.test.py | 14 +-
33 files changed, 755 insertions(+), 707 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.