GitHub user jrushford opened a pull request:
https://github.com/apache/trafficserver/pull/1177
TS-4391: Duplicated parent origin retry types
(cherry picked from commit 6d4637ce33ab5375cb03c06899f7ab15eb293e7e)
conflicts were properly resolved.
Conflicts:
proxy/http/HttpTransact.cc
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/jrushford/trafficserver ts-4391
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/trafficserver/pull/1177.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 #1177
----
----
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
