From patchwork Thu Feb 9 19:39:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael-Doyle Hudson X-Patchwork-Id: 6728 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 B8D4423E01 for ; Thu, 9 Feb 2012 19:39:13 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 5DB48A18047 for ; Thu, 9 Feb 2012 19:39:13 +0000 (UTC) Received: by iabz7 with SMTP id z7so3969237iab.11 for ; Thu, 09 Feb 2012 11:39:12 -0800 (PST) Received: by 10.42.74.195 with SMTP id x3mr4609378icj.41.1328816352803; Thu, 09 Feb 2012 11:39:12 -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.231.12.131 with SMTP id x3cs51801ibx; Thu, 9 Feb 2012 11:39:11 -0800 (PST) Received: by 10.180.92.227 with SMTP id cp3mr4862075wib.13.1328816350916; Thu, 09 Feb 2012 11:39:10 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id l3si2422317wed.120.2012.02.09.11.39.10 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 09 Feb 2012 11:39:10 -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 1RvZpm-000533-7m for ; Thu, 09 Feb 2012 19:39:10 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 29D91E0526 for ; Thu, 9 Feb 2012 19:39:10 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-scheduler X-Launchpad-Branch: ~linaro-validation/lava-scheduler/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 128 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-scheduler/trunk] Rev 128: fix migration from last commit (one day i'll stop merging broken migrations :/) Message-Id: <20120209193910.5094.88757.launchpad@ackee.canonical.com> Date: Thu, 09 Feb 2012 19:39:10 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14763"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 187912f7c22b3539535903a09802b8939e88194e X-Gm-Message-State: ALoCoQlzYRjK7+58Wp/5dApsTMgFNSzWXcM10z3YSRPP0gPxV7Vo4NQyNb2kU3WumEo2aiJ/ozZn ------------------------------------------------------------ revno: 128 committer: Michael Hudson-Doyle branch nick: trunk timestamp: Thu 2012-02-09 11:37:19 -0800 message: fix migration from last commit (one day i'll stop merging broken migrations :/) modified: lava_scheduler_app/migrations/0013_auto__add_devicestatetransition.py --- lp:lava-scheduler https://code.launchpad.net/~linaro-validation/lava-scheduler/trunk You are subscribed to branch lp:lava-scheduler. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-scheduler/trunk/+edit-subscription === modified file 'lava_scheduler_app/migrations/0013_auto__add_devicestatetransition.py' --- lava_scheduler_app/migrations/0013_auto__add_devicestatetransition.py 2012-02-08 01:23:38 +0000 +++ lava_scheduler_app/migrations/0013_auto__add_devicestatetransition.py 2012-02-09 19:37:19 +0000 @@ -13,7 +13,7 @@ ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), ('created_on', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), ('created_by', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'], null=True, blank=True)), - ('device', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['lava_scheduler_app.Device'])), + ('device', self.gf('django.db.models.fields.related.ForeignKey')(related_name='transitions', to=orm['lava_scheduler_app.Device'])), ('job', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['lava_scheduler_app.TestJob'], null=True, blank=True)), ('old_state', self.gf('django.db.models.fields.IntegerField')()), ('new_state', self.gf('django.db.models.fields.IntegerField')()), @@ -77,10 +77,12 @@ 'Meta': {'object_name': 'DeviceStateTransition'}, 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), 'created_on': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'device': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['lava_scheduler_app.Device']"}), + 'device': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'transitions'", 'to': "orm['lava_scheduler_app.Device']"}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'message': ('django.db.models.fields.TextField', [], {}), - 'new_state': ('django.db.models.fields.IntegerField', [], {}) + 'job': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['lava_scheduler_app.TestJob']", 'null': 'True', 'blank': 'True'}), + 'message': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'new_state': ('django.db.models.fields.IntegerField', [], {}), + 'old_state': ('django.db.models.fields.IntegerField', [], {}) }, 'lava_scheduler_app.devicetype': { 'Meta': {'object_name': 'DeviceType'},