You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by br...@apache.org on 2014/05/01 22:51:30 UTC
[2/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/trafficserver
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/7fe85fae
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/7fe85fae
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/7fe85fae
Branch: refs/heads/master
Commit: 7fe85faeecffb61dfcf643ad40df280dcbda4a2b
Parents: 1630af7 22bb492
Author: Brian Geffon <br...@apache.org>
Authored: Thu May 1 13:51:06 2014 -0700
Committer: Brian Geffon <br...@apache.org>
Committed: Thu May 1 13:51:06 2014 -0700
----------------------------------------------------------------------
.gitignore | 3 ++
CHANGES | 2 ++
ci/rat-regex.txt | 5 +++
configure.ac | 1 -
lib/atscppapi/examples/Makefile.am | 41 ++++++++++++-----------
lib/atscppapi/examples/intercept/Makefile.am | 17 +++++-----
lib/ts/test_Vec.cc | 2 +-
mgmt/Main.cc | 2 +-
proxy/Main.cc | 2 +-
proxy/Makefile.am | 1 -
proxy/congest/Makefile.am | 1 -
proxy/http/Makefile.am | 1 -
proxy/logging/Makefile.am | 1 -
proxy/spdy/Makefile.am | 1 -
proxy/spdy/SpdySM.cc | 9 ++++-
rc/trafficserver.service.in | 17 ++++++++++
16 files changed, 68 insertions(+), 38 deletions(-)
----------------------------------------------------------------------