| 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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 { | 102 { |
| 103 'master': 'ChromiumFYI', | 103 'master': 'ChromiumFYI', |
| 104 'builder': 'CrWinClangGoma', | 104 'builder': 'CrWinClangGoma', |
| 105 'hostname': 'vm848-m1', | 105 'hostname': 'vm848-m1', |
| 106 'os': 'win', | 106 'os': 'win', |
| 107 'version': 'win7', | 107 'version': 'win7', |
| 108 'bits': '64', | 108 'bits': '64', |
| 109 }, | 109 }, |
| 110 { | 110 { |
| 111 'master': 'ChromiumFYI', | 111 'master': 'ChromiumFYI', |
| 112 'builder': 'Android Builder (dbg)', | 112 'builder': ['Android Builder (dbg)', 'Android Find Annotated Test'] |
| 113 'hostname': 'vm823-m1', | 113 'hostname': 'vm823-m1', |
| 114 'os': 'linux', | 114 'os': 'linux', |
| 115 'version': 'precise', | 115 'version': 'precise', |
| 116 'bits': '64', | 116 'bits': '64', |
| 117 }, | 117 }, |
| 118 { | 118 { |
| 119 'master': 'ChromiumFYI', | 119 'master': 'ChromiumFYI', |
| 120 'builder': 'Android Remoting Tests', | 120 'builder': 'Android Remoting Tests', |
| 121 'hostname': 'build65-b1', | 121 'hostname': 'build65-b1', |
| 122 'os': 'linux', | 122 'os': 'linux', |
| (...skipping 564 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 687 }, | 687 }, |
| 688 { | 688 { |
| 689 'master': 'ChromiumFYI', | 689 'master': 'ChromiumFYI', |
| 690 'builder': 'Linux Kitchen (annotated_run)', | 690 'builder': 'Linux Kitchen (annotated_run)', |
| 691 'hostname': 'slave74-c1', | 691 'hostname': 'slave74-c1', |
| 692 'os': 'linux', | 692 'os': 'linux', |
| 693 'version': 'precise', | 693 'version': 'precise', |
| 694 'bits': '64', | 694 'bits': '64', |
| 695 }, | 695 }, |
| 696 ] | 696 ] |
| OLD | NEW |