trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject [4/4] git commit: Merge branch 'master' into 3.3.x
Date Tue, 06 Aug 2013 19:59:25 GMT
Merge branch 'master' into 3.3.x

* master:
  TS-2102 SPDY plugin tries to setup protocol handler too early.
  TS-1953: close this by adding an example & CHANGES
  fix indentation


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/5dec2676
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/5dec2676
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/5dec2676

Branch: refs/heads/3.3.x
Commit: 5dec26764e98ac48dd0f2f54125920c370e390b7
Parents: e413f12 c1c963e
Author: Leif Hedstrom <zwoop@apache.org>
Authored: Tue Aug 6 13:59:12 2013 -0600
Committer: Leif Hedstrom <zwoop@apache.org>
Committed: Tue Aug 6 13:59:12 2013 -0600

----------------------------------------------------------------------
 CHANGES                           |  5 +++
 example/Makefile.am               |  4 +-
 example/version/version.c         | 67 ++++++++++++++++++++++++++++++++++
 plugins/experimental/spdy/spdy.cc | 24 +++++++++---
 proxy/ClassH.txt                  |  4 +-
 5 files changed, 95 insertions(+), 9 deletions(-)
----------------------------------------------------------------------



Mime
View raw message