GitHub user shenzhang920 opened a pull request:

    https://github.com/apache/trafficserver/pull/1436

    Backport f71b75e and 734aa31 from master to 6.2.x

    

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/shenzhang920/trafficserver 6.2.x

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/trafficserver/pull/1436.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #1436
    
----
commit eace07ba61ff7a592f8ef94f5c6c4d1bf8f04fbe
Author: Shen Zhang <[email protected]>
Date:   2017-02-08T22:39:01Z

    issue #1399 add back partial code of tcp_congestion_control erased by 
TS-3612
    
    (cherry picked from commit f71b75ef6f32abd168ac646a50be238e4375cadf)

commit 7810b80eeea4bd47e39e602d00c8c04185801464
Author: Masakazu Kitajo <[email protected]>
Date:   2017-02-09T01:13:50Z

    Fix a build issue that use of undeclared variables
    
    PR-1426 causes build error on some platforms which doesn't support 
congestion control.
    
    (cherry picked from commit 734aa31e0e6b4b200f960eb2be0282ce4826b969)

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---

Reply via email to