You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by sh...@apache.org on 2015/04/23 21:43:16 UTC
[2/3] trafficserver git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/trafficserver
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/cd4209bd
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/cd4209bd
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/cd4209bd
Branch: refs/heads/master
Commit: cd4209bdfb50ddb883b17a6f498f55b5812f33f3
Parents: a5a2380 a777a14
Author: shinrich <sh...@yahoo-inc.com>
Authored: Thu Apr 23 14:24:27 2015 -0500
Committer: shinrich <sh...@yahoo-inc.com>
Committed: Thu Apr 23 14:24:27 2015 -0500
----------------------------------------------------------------------
CHANGES | 4 ++++
lib/ts/ink_atomic.h | 2 +-
lib/ts/ink_memory.h | 3 ---
lib/ts/signals.cc | 2 +-
mgmt/utils/MgmtSocket.cc | 2 +-
proxy/InkAPI.cc | 2 +-
proxy/Main.cc | 4 ++--
proxy/api/ts/ts.h | 2 +-
proxy/http/HttpSM.cc | 2 ++
proxy/http/remap/RemapConfig.cc | 3 ++-
proxy/logging/LogUtils.cc | 4 ++++
11 files changed, 19 insertions(+), 11 deletions(-)
----------------------------------------------------------------------