TS-5087: Updates the AL2 license on all .po files#1265
Merged
PSUdaemon merged 2 commits intoapache:6.2.xfrom Dec 15, 2016
Merged
TS-5087: Updates the AL2 license on all .po files#1265PSUdaemon merged 2 commits intoapache:6.2.xfrom
PSUdaemon merged 2 commits intoapache:6.2.xfrom
Conversation
(cherry picked from commit 8da9d4f) 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
(cherry picked from commit 7487ff7) Conflicts: ci/rat-regex.txt
|
FreeBSD build successful! See https://ci.trafficserver.apache.org/job/Github-FreeBSD/1268/ for details. |
|
Linux build successful! See https://ci.trafficserver.apache.org/job/Github-Linux/1163/ for details. |
PSUdaemon
approved these changes
Dec 14, 2016
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry picks from master.