GitHub user zwoop opened a pull request:
https://github.com/apache/trafficserver/pull/1265
TS-5087: Updates the AL2 license on all .po files
Cherry picks from master.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/zwoop/trafficserver TS-5087-6.2.x
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/trafficserver/pull/1265.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 #1265
----
commit 28c38e4c32ebc7e55d23c3553ce612dcfdc01899
Author: Leif Hedstrom <zw...@apache.org>
Date: 2016-12-08T20:58:11Z
TS-5087: Updates the AL2 license on all .po files
(cherry picked from commit 8da9d4fea9333980ca2b552077da28573a4a89e5)
Conflicts:
doc/locale/ja/LC_MESSAGES/admin-guide/monitoring/monitoring/third-party/circonus.en.po
doc/locale/ja/LC_MESSAGES/admin-guide/monitoring/monitoring/third-party/logstash.en.po
doc/locale/ja/LC_MESSAGES/admin-guide/plugins/collapsed_forwarding.en.po
doc/locale/ja/LC_MESSAGES/admin-guide/plugins/escalate.en.po
doc/locale/ja/LC_MESSAGES/admin-guide/plugins/hook-trace.en.po
doc/locale/ja/LC_MESSAGES/admin-guide/plugins/regex_revalidate.en.po
doc/locale/ja/LC_MESSAGES/admin-guide/plugins/webp_transform.en.po
doc/locale/ja/LC_MESSAGES/developer-guide/api/functions/TSSslServerContextCreate.en.po
doc/locale/ja/LC_MESSAGES/developer-guide/api/functions/TSUuidCreate.en.po
doc/locale/ja/LC_MESSAGES/developer-guide/api/types/TSUuid.en.po
commit fb5f5c27ceece2f3ebe18b87bc21f77b1dda442d
Author: Leif Hedstrom <zw...@apache.org>
Date: 2016-12-09T15:08:31Z
Update the RAT exceptions
(cherry picked from commit 7487ff750cd214ee956557273c8059b9b3580983)
Conflicts:
ci/rat-regex.txt
----
---
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.
---
