diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-01-13 11:42:18 -0800 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-01-13 11:42:18 -0800 |
| commit | b70206fe52ee6509f3f965bf2a95b2cbd321088d (patch) | |
| tree | fa59a43171854465c89af72734d45350070b7366 /tools/run_tests/jobset.py | |
| parent | 295a7ce511f1a2145f70942f826d0e225c00ba62 (diff) | |
| parent | 7149ca6bd0ce73a08fa512415d3f641a06a15a75 (diff) | |
Merge branch 'master' into release-0_12_master_merge
Diffstat (limited to 'tools/run_tests/jobset.py')
| -rwxr-xr-x | tools/run_tests/jobset.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/run_tests/jobset.py b/tools/run_tests/jobset.py index 0b01bc4bec..e33433daf2 100755 --- a/tools/run_tests/jobset.py +++ b/tools/run_tests/jobset.py @@ -1,4 +1,4 @@ -# Copyright 2015, Google Inc. +# Copyright 2015-2016, Google Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -450,4 +450,3 @@ def run(cmdlines, js.set_remaining(remaining) js.finish() return js.get_num_failures(), js.resultset - |