| 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 'bits': '64', | 61 'bits': '64', |
| 62 }, | 62 }, |
| 63 { | 63 { |
| 64 'master': 'ChromiumLinux', | 64 'master': 'ChromiumLinux', |
| 65 'builder': 'Cast Linux', | 65 'builder': 'Cast Linux', |
| 66 'hostname': 'vm28-m1', | 66 'hostname': 'vm28-m1', |
| 67 'os': 'linux', | 67 'os': 'linux', |
| 68 'version': 'precise', | 68 'version': 'precise', |
| 69 'bits': '64', | 69 'bits': '64', |
| 70 }, | 70 }, |
| 71 { |
| 72 'master': 'ChromiumLinux', |
| 73 'builder': 'Blimp Linux (dbg)', |
| 74 'hostname': 'slave77-c1', |
| 75 'os': 'linux', |
| 76 'version': 'trusty', |
| 77 'bits': '64', |
| 78 }, |
| 71 ################################################################################ | 79 ################################################################################ |
| 72 # Android | 80 # Android |
| 73 ################################################################################ | 81 ################################################################################ |
| 74 { | 82 { |
| 75 'master': 'ChromiumLinux', | 83 'master': 'ChromiumLinux', |
| 76 'hostname': 'vm972-m1', | 84 'hostname': 'vm972-m1', |
| 77 'builder': 'Android Arm64 Builder (dbg)', | 85 'builder': 'Android Arm64 Builder (dbg)', |
| 78 'os': 'linux', | 86 'os': 'linux', |
| 79 'version': 'precise', | 87 'version': 'precise', |
| 80 'bits': '64', | 88 'bits': '64', |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 }, | 129 }, |
| 122 { | 130 { |
| 123 'master': 'ChromiumLinux', | 131 'master': 'ChromiumLinux', |
| 124 'builder': 'Cast Android (dbg)', | 132 'builder': 'Cast Android (dbg)', |
| 125 'hostname': 'vm29-m1', | 133 'hostname': 'vm29-m1', |
| 126 'os': 'linux', | 134 'os': 'linux', |
| 127 'version': 'precise', | 135 'version': 'precise', |
| 128 'bits': '64', | 136 'bits': '64', |
| 129 }, | 137 }, |
| 130 ] | 138 ] |
| OLD | NEW |