| 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 { | 58 { |
| 59 'master': 'ChromiumFYI', | 59 'master': 'ChromiumFYI', |
| 60 'builder': 'Chromium Linux Redux', | 60 'builder': 'Chromium Linux Redux', |
| 61 'hostname': 'vm859-m1', | 61 'hostname': 'vm859-m1', |
| 62 'os': 'linux', | 62 'os': 'linux', |
| 63 'version': 'precise', | 63 'version': 'precise', |
| 64 'bits': '64', | 64 'bits': '64', |
| 65 }, | 65 }, |
| 66 { | 66 { |
| 67 'master': 'ChromiumFYI', | 67 'master': 'ChromiumFYI', |
| 68 'builder': 'Chromium Vista Memory', |
| 69 'hostname': 'vm878-m1', |
| 70 'os': 'win', |
| 71 'version': 'vista', |
| 72 'bits': '64', |
| 73 }, |
| 74 { |
| 75 'master': 'ChromiumFYI', |
| 76 'builder': 'Chromium Linux Memory', |
| 77 'hostname': 'vm430-m1', |
| 78 'os': 'linux', |
| 79 'version': 'precise', |
| 80 'bits': '32', |
| 81 }, |
| 82 { |
| 83 'master': 'ChromiumFYI', |
| 84 'builder': 'Chromium Mac Memory', |
| 85 'hostname': 'vm628-m1', |
| 86 'os': 'mac', |
| 87 'version': '10.6', |
| 88 'bits': '64', |
| 89 }, |
| 90 { |
| 91 'master': 'ChromiumFYI', |
| 68 'builder': 'Linux Tests (tsan RV)', | 92 'builder': 'Linux Tests (tsan RV)', |
| 69 'hostname': 'vm413-m1', | 93 'hostname': 'vm413-m1', |
| 70 'os': 'linux', | 94 'os': 'linux', |
| 71 'version': 'precise', | 95 'version': 'precise', |
| 72 'bits': '64', | 96 'bits': '64', |
| 73 }, | 97 }, |
| 74 { | 98 { |
| 75 'master': 'ChromiumFYI', | 99 'master': 'ChromiumFYI', |
| 76 'builder': 'Windows Tests (TSan Win 7)', | 100 'builder': 'Windows Tests (TSan Win 7)', |
| 77 'hostname': 'vm418-m1', | 101 'hostname': 'vm418-m1', |
| (...skipping 628 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 706 ] + [ | 730 ] + [ |
| 707 # Deployed for http://crbug.com/166949 but not used yet. | 731 # Deployed for http://crbug.com/166949 but not used yet. |
| 708 { | 732 { |
| 709 'master': 'ChromiumFYIUnused', | 733 'master': 'ChromiumFYIUnused', |
| 710 'hostname': 'vm889-m1' , | 734 'hostname': 'vm889-m1' , |
| 711 'os': 'win', | 735 'os': 'win', |
| 712 'version': 'win7', | 736 'version': 'win7', |
| 713 'bits': '64', | 737 'bits': '64', |
| 714 } | 738 } |
| 715 ] | 739 ] |
| OLD | NEW |