| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # ex: set syntax=python: | 2 # ex: set syntax=python: |
| 3 | 3 |
| 4 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 4 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 5 # Use of this source code is governed by a BSD-style license that can be | 5 # Use of this source code is governed by a BSD-style license that can be |
| 6 # found in the LICENSE file. | 6 # found in the LICENSE file. |
| 7 | 7 |
| 8 # See master.experimental/slaves.cfg for documentation. | 8 # See master.experimental/slaves.cfg for documentation. |
| 9 | 9 |
| 10 | 10 |
| (...skipping 590 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 601 'builder': [ | 601 'builder': [ |
| 602 'GomaCanaryiOS', | 602 'GomaCanaryiOS', |
| 603 ], | 603 ], |
| 604 'hostname': 'vm66-m1', | 604 'hostname': 'vm66-m1', |
| 605 'os': 'mac', | 605 'os': 'mac', |
| 606 'version': '10.9', | 606 'version': '10.9', |
| 607 'bits': '64', | 607 'bits': '64', |
| 608 }, | 608 }, |
| 609 { | 609 { |
| 610 'master': 'ChromiumFYI', | 610 'master': 'ChromiumFYI', |
| 611 'builder': 'Ozone Linux', |
| 612 'hostname': 'slave17-c1', |
| 613 'os': 'linux', |
| 614 'version': 'trusty', |
| 615 'bits': '64', |
| 616 }, |
| 617 { |
| 618 'master': 'ChromiumFYI', |
| 611 'builder': 'Site Isolation Android', | 619 'builder': 'Site Isolation Android', |
| 612 'hostname': 'slave45-c1', | 620 'hostname': 'slave45-c1', |
| 613 'os': 'linux', | 621 'os': 'linux', |
| 614 'version': 'trusty', | 622 'version': 'trusty', |
| 615 'bits': '64', | 623 'bits': '64', |
| 616 }, | 624 }, |
| 617 { | 625 { |
| 618 'master': 'ChromiumFYI', | 626 'master': 'ChromiumFYI', |
| 619 'builder': 'Site Isolation Linux', | 627 'builder': 'Site Isolation Linux', |
| 620 'hostname': 'vm977-m1', | 628 'hostname': 'vm977-m1', |
| (...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 864 'master': 'ChromiumFYI', | 872 'master': 'ChromiumFYI', |
| 865 'builder': [ | 873 'builder': [ |
| 866 'Chromium Win PGO Builder', | 874 'Chromium Win PGO Builder', |
| 867 'Chromium Win x64 PGO Builder', | 875 'Chromium Win x64 PGO Builder', |
| 868 ], | 876 ], |
| 869 'hostname': slave, | 877 'hostname': slave, |
| 870 'os': 'win', | 878 'os': 'win', |
| 871 'version': 'win7', | 879 'version': 'win7', |
| 872 'bits': '64', | 880 'bits': '64', |
| 873 }) | 881 }) |
| OLD | NEW |