You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by am...@apache.org on 2012/05/28 07:15:23 UTC
[3/5] git commit: Merge branch 'master' into ts-1195
Merge branch 'master' into ts-1195
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/09684977
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/09684977
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/09684977
Branch: refs/heads/master
Commit: 09684977381645bf313d7db16cd1a79cb4e8b6a1
Parents: ebc4c1c 71b3a84
Author: Alan M. Carroll <am...@network-geographics.com>
Authored: Sun May 27 22:17:18 2012 -0500
Committer: Alan M. Carroll <am...@network-geographics.com>
Committed: Sun May 27 22:17:18 2012 -0500
----------------------------------------------------------------------
CHANGES | 6 ++++--
rc/trafficserver.conf.in | 10 +++++++++-
rc/trafficserver.in | 6 +++++-
3 files changed, 18 insertions(+), 4 deletions(-)
----------------------------------------------------------------------