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/199b6b84 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/199b6b84 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/199b6b84 Branch: refs/heads/master Commit: 199b6b846a970d40b4146c55c65e11b2b59d6db7 Parents: e6e999e 3775c86 Author: Brian Geffon <[email protected]> Authored: Mon Oct 21 17:56:21 2013 -0700 Committer: Brian Geffon <[email protected]> Committed: Mon Oct 21 17:56:21 2013 -0700 ---------------------------------------------------------------------- CHANGES | 3 ++ plugins/experimental/remap_stats/remap_stats.c | 6 +-- proxy/logging/LogAccessHttp.cc | 42 +++++++++++---------- 3 files changed, 28 insertions(+), 23 deletions(-) ----------------------------------------------------------------------
