summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authormaruel <maruel@chromium.org>2016-02-24 10:43:36 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-24 18:46:00 +0000
commit5f360dd317aac6667e0e6461917e23a894c25505 (patch)
tree4db68c958b1676c5928170daba4555c2a316af71 /tools
parente5648339683b69d8eba1b7899b4e2593d2f83de0 (diff)
downloadchromium_src-5f360dd317aac6667e0e6461917e23a894c25505.zip
chromium_src-5f360dd317aac6667e0e6461917e23a894c25505.tar.gz
chromium_src-5f360dd317aac6667e0e6461917e23a894c25505.tar.bz2
Roll src/tools/swarming_client/ 0b908f187..71c61c858 (7 commits).
https://chromium.googlesource.com/external/swarming.client.git/+log/0b908f18767c..71c61c858bb2 $ git log 0b908f187..71c61c858 --date=short --no-merges --format='%ad %ae %s' 2016-02-22 maruel Fix collection timeout to be automatic instead of hard coded. 2016-02-17 sergeyberezin Roll (gae_)ts_mon to b54f1d3 2016-02-10 tandrii Set Cache-Control headers to 1 year when uploading items. 2016-01-29 maruel Increase default cache size limit to 50Gb. 2016-01-26 sergeyberezin luci-py: bump infra_libs to 1191fcd. 2016-01-25 sergeyberezin luci-py: Deduplicate protobuf library 2016-01-22 sergeyberezin Vendor (gae_)ts_mon into luci-py. Update the license check due to new third parties pulled in. R=tandrii@chromium.org,phajdan.jr@chromium.org BUG= Review URL: https://codereview.chromium.org/1723543002 Cr-Commit-Position: refs/heads/master@{#377325}
Diffstat (limited to 'tools')
-rwxr-xr-xtools/checklicenses/checklicenses.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/tools/checklicenses/checklicenses.py b/tools/checklicenses/checklicenses.py
index 9b821e0..100faa7 100755
--- a/tools/checklicenses/checklicenses.py
+++ b/tools/checklicenses/checklicenses.py
@@ -486,6 +486,16 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = {
'UNKNOWN',
],
+ # New BSD license. http://crbug.com/98455
+ 'tools/swarming_client/third_party/google': [
+ 'UNKNOWN',
+ ],
+
+ # Apache v2.0.
+ 'tools/swarming_client/third_party/googleapiclient': [
+ 'UNKNOWN',
+ ],
+
# http://crbug.com/334668
# MIT license.
'tools/swarming_client/third_party/httplib2': [