[trafficserver] branch master updated (e69121a -> 86fa338)

[zw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a change to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git.

      from  e69121a   Merge pull request #867 from zwoop/TS-2048
      adds  fa9dc5e   TS-4360 Renames NPN_ defines to ALPN_
       new  86fa338   Merge pull request #861 from zwoop/TS-4360

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 lib/records/RecHttp.cc            | 46 +++++++++++++++++++--------------------
 lib/ts/apidefs.h.in               | 26 +++++++++++-----------
 proxy/http/HttpProxyServerMain.cc | 14 ++++++------
 3 files changed, 43 insertions(+), 43 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].

[trafficserver] 01/01: Merge pull request #861 from zwoop/TS-4360

[zw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

commit 86fa3389d26a9723ae8441255ecccdfed274805b
Merge: e69121a fa9dc5e
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Tue Aug 16 22:09:58 2016 -0600

    Merge pull request #861 from zwoop/TS-4360
    
    TS-4360 Renames NPN_ defines to ALPN_

 lib/records/RecHttp.cc            | 46 +++++++++++++++++++--------------------
 lib/ts/apidefs.h.in               | 26 +++++++++++-----------
 proxy/http/HttpProxyServerMain.cc | 14 ++++++------
 3 files changed, 43 insertions(+), 43 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.