Merge branch 'master' into 6.0.x * master: TS-3796: health check fails once during startup Revert "TS-3376: traffic_server failed assert s->current.server->had_connect_fail()" TS-3376: traffic_server failed assert s->current.server->had_connect_fail() TS-3810 traffic_manager leaks that thread stack, make sure to detach the threads Revert "TS-3810 traffic_manager leaks that thread stack, make sure to detach the threads" TS-3810 traffic_manager leaks that thread stack, make sure to detach the threads
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/6062188f Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/6062188f Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/6062188f Branch: refs/heads/6.0.x Commit: 6062188f57efa48d6208311ff4d111d41b7cd93b Parents: 53f150c 35c5a45 Author: Leif Hedstrom <[email protected]> Authored: Mon Aug 3 17:09:55 2015 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Mon Aug 3 17:09:55 2015 -0600 ---------------------------------------------------------------------- cmd/traffic_manager/MgmtHandlers.cc | 12 +++++++----- mgmt/LocalManager.cc | 4 ++-- mgmt/api/EventControlMain.cc | 2 +- mgmt/api/TSControlMain.cc | 2 +- mgmt/cluster/ClusterCom.cc | 2 +- mgmt/utils/MgmtSocket.cc | 4 +++- mgmt/utils/MgmtSocket.h | 2 +- 7 files changed, 16 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
