trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bri...@apache.org
Subject [2/3] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
Date Thu, 01 May 2014 20:51:30 GMT
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 <briang@apache.org>
Authored: Thu May 1 13:51:06 2014 -0700
Committer: Brian Geffon <briang@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(-)
----------------------------------------------------------------------



Mime
View raw message