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/03c19353 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/03c19353 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/03c19353 Branch: refs/heads/master Commit: 03c193537262a6ee9fe45203dedffa295ae5a9ad Parents: 045bfbd ae56b90 Author: Sudheer Vinukonda <sudhe...@yahoo-inc.com> Authored: Fri Sep 5 18:09:44 2014 +0000 Committer: Sudheer Vinukonda <sudhe...@yahoo-inc.com> Committed: Fri Sep 5 18:09:44 2014 +0000 ---------------------------------------------------------------------- CHANGES | 2 ++ cmd/traffic_manager/traffic_manager.cc | 5 +++-- proxy/Main.cc | 28 ++++++++++++++-------------- 3 files changed, 19 insertions(+), 16 deletions(-) ----------------------------------------------------------------------
