| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # ex: set syntax=python: | 2 # ex: set syntax=python: |
| 3 | 3 |
| 4 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 4 # Copyright (c) 2011 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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 'os': 'linux', | 76 'os': 'linux', |
| 77 }, | 77 }, |
| 78 { | 78 { |
| 79 'master': 'ChromiumOS', | 79 'master': 'ChromiumOS', |
| 80 'builder': 'x86 generic commit queue', | 80 'builder': 'x86 generic commit queue', |
| 81 'hostname': 'build19-m2', | 81 'hostname': 'build19-m2', |
| 82 'os': 'linux', | 82 'os': 'linux', |
| 83 }, | 83 }, |
| 84 { | 84 { |
| 85 'master': 'ChromiumOS', | 85 'master': 'ChromiumOS', |
| 86 'builder': 'arm generic commit queue', |
| 87 'hostname': 'vm5-m2', |
| 88 'os': 'linux', |
| 89 }, |
| 90 { |
| 91 'master': 'ChromiumOS', |
| 92 'builder': 'tegra2 commit queue', |
| 93 'hostname': 'vm6-m2', |
| 94 'os': 'linux', |
| 95 }, |
| 96 { |
| 97 'master': 'ChromiumOS', |
| 86 'builder': ['amd64 generic full', 'amd64 corei7 full'], | 98 'builder': ['amd64 generic full', 'amd64 corei7 full'], |
| 87 'hostname': 'build20-m2', | 99 'hostname': 'build20-m2', |
| 88 'os': 'linux', | 100 'os': 'linux', |
| 89 }, | 101 }, |
| 90 { | 102 { |
| 91 'master': 'ChromiumOS', | 103 'master': 'ChromiumOS', |
| 92 'builder': 'tegra2 PFQ', | 104 'builder': 'tegra2 PFQ', |
| 93 'hostname': 'build21-m2', | 105 'hostname': 'build21-m2', |
| 94 'os': 'linux', | 106 'os': 'linux', |
| 95 }, | 107 }, |
| 96 | 108 |
| 97 ] | 109 ] |
| OLD | NEW |