Updated Branches: refs/heads/3.0.x f80179bce -> 9310f113a refs/heads/master f51778f70 -> 3c3b7541b
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/3c3b7541 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/3c3b7541 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/3c3b7541 Branch: refs/heads/master Commit: 3c3b7541b87f079525f1b4090f71dae728ec7900 Parents: 1f66ef6 f51778f Author: [email protected] <[email protected]> Authored: Mon Mar 19 19:31:42 2012 -0700 Committer: John Plevyak <[email protected]> Committed: Mon Mar 19 19:31:42 2012 -0700 ---------------------------------------------------------------------- .gitignore | 2 ++ CHANGES | 2 ++ configure.ac | 13 +++++++++---- rc/trafficserver.service.in | 13 +++++++++++++ 4 files changed, 26 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
