You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jr...@apache.org on 2016/07/01 22:27:46 UTC

[trafficserver] branch master updated (4c60dd5 -> e5d53b1)

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

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

      from  4c60dd5   Merge pull request #784 from jpeach/fix/disable-proxy-tests
      adds  dff3d2b   TS-4633: Fix an erroneous warning message when reading the parent.config file.
       new  e5d53b1   Merge pull request #782 from jrushford/TS-4633

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:
 proxy/ParentSelection.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

[trafficserver] 01/01: Merge pull request #782 from jrushford/TS-4633

Posted by jr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit e5d53b15a79e042a3ac792c3339a0249a269e62d
Merge: 4c60dd5 dff3d2b
Author: John J. Rushford <jr...@apache.org>
AuthorDate: Fri Jul 1 16:27:40 2016 -0600

    Merge pull request #782 from jrushford/TS-4633
    
    TS-4633: Fix an erroneous warning message when reading the parent.con\u2026

 proxy/ParentSelection.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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