| 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 500 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 511 'master': 'ChromiumFYI', | 511 'master': 'ChromiumFYI', |
| 512 'hostname': 'build33-m1', | 512 'hostname': 'build33-m1', |
| 513 'builder': 'Chromium Linux Browser (valgrind) (4)', | 513 'builder': 'Chromium Linux Browser (valgrind) (4)', |
| 514 'os': 'linux', | 514 'os': 'linux', |
| 515 'version': 'precise', | 515 'version': 'precise', |
| 516 'bits': '64', | 516 'bits': '64', |
| 517 }, | 517 }, |
| 518 { | 518 { |
| 519 'master': 'ChromiumFYI', | 519 'master': 'ChromiumFYI', |
| 520 'hostname': 'ios-mac-1', | 520 'hostname': 'ios-mac-1', |
| 521 'builder': ['Chromium iOS Simulator (dbg)', 'Chromium iOS Device',], | 521 'builder': ['Chromium iOS Simulator (dbg)', 'Chromium iOS Device', |
| 522 'Chromium iOS Device (ninja)',], |
| 522 'os': 'mac', | 523 'os': 'mac', |
| 523 'version': '10.7', | 524 'version': '10.7', |
| 524 }, | 525 }, |
| 525 { | 526 { |
| 526 'master': 'ChromiumFYI', | 527 'master': 'ChromiumFYI', |
| 527 'hostname': 'vm455-m1', | 528 'hostname': 'vm455-m1', |
| 528 'builder': ['More NaCl Tests (win32)'], | 529 'builder': ['More NaCl Tests (win32)'], |
| 529 'os': 'win', | 530 'os': 'win', |
| 530 'version': 'xp', | 531 'version': 'xp', |
| 531 'bits': '32', | 532 'bits': '32', |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 792 ] + [ | 793 ] + [ |
| 793 # Deployed for http://crbug.com/166949 but not used yet. | 794 # Deployed for http://crbug.com/166949 but not used yet. |
| 794 { | 795 { |
| 795 'master': 'ChromiumFYIUnused', | 796 'master': 'ChromiumFYIUnused', |
| 796 'hostname': 'vm889-m1' , | 797 'hostname': 'vm889-m1' , |
| 797 'os': 'win', | 798 'os': 'win', |
| 798 'version': 'win7', | 799 'version': 'win7', |
| 799 'bits': '64', | 800 'bits': '64', |
| 800 } | 801 } |
| 801 ] | 802 ] |
| OLD | NEW |