From patchwork Wed Dec 7 01:51:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael-Doyle Hudson X-Patchwork-Id: 5522 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 5604A23E0C for ; Wed, 7 Dec 2011 01:51:21 +0000 (UTC) Received: from mail-ee0-f52.google.com (mail-ee0-f52.google.com [74.125.83.52]) by fiordland.canonical.com (Postfix) with ESMTP id 44BFFA184C1 for ; Wed, 7 Dec 2011 01:51:21 +0000 (UTC) Received: by eekc14 with SMTP id c14so43279eek.11 for ; Tue, 06 Dec 2011 17:51:21 -0800 (PST) Received: by 10.14.4.20 with SMTP id 20mr3216543eei.202.1323222681016; Tue, 06 Dec 2011 17:51:21 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.205.129.2 with SMTP id hg2cs58265bkc; Tue, 6 Dec 2011 17:51:20 -0800 (PST) Received: by 10.180.7.198 with SMTP id l6mr21300609wia.3.1323222679167; Tue, 06 Dec 2011 17:51:19 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id ey2si54994wbb.19.2011.12.06.17.51.19 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 06 Dec 2011 17:51:19 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1RY6fG-0008Ha-VL for ; Wed, 07 Dec 2011 01:51:18 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id E3D61E0785 for ; Wed, 7 Dec 2011 01:51:18 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-dispatcher X-Launchpad-Branch: ~linaro-validation/lava-dispatcher/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 174 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 174: accept a client_type of "conmux" as an alias for "master" for now Message-Id: <20111207015118.5282.25049.launchpad@ackee.canonical.com> Date: Wed, 07 Dec 2011 01:51:18 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14435"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: a3256154f705aa8568626627fda990d33c111433 ------------------------------------------------------------ revno: 174 committer: Michael Hudson-Doyle branch nick: trunk timestamp: Wed 2011-12-07 14:43:24 +1300 message: accept a client_type of "conmux" as an alias for "master" for now modified: lava_dispatcher/context.py --- lp:lava-dispatcher https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk You are subscribed to branch lp:lava-dispatcher. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription === modified file 'lava_dispatcher/context.py' --- lava_dispatcher/context.py 2011-11-30 02:31:12 +0000 +++ lava_dispatcher/context.py 2011-12-07 01:43:24 +0000 @@ -33,7 +33,7 @@ device_config = get_device_config( target, dispatcher_config.config_dir) client_type = device_config.get('client_type') - if client_type == 'master': + if client_type == 'master' or client_type == 'conmux': self._client = LavaMasterImageClient(self, device_config) elif client_type == 'qemu': self._client = LavaQEMUClient(self, device_config)