From patchwork Thu Jan 19 15:05:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zygmunt Krynicki X-Patchwork-Id: 6297 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 9161823E0C for ; Thu, 19 Jan 2012 15:05:17 +0000 (UTC) Received: from mail-bk0-f52.google.com (mail-bk0-f52.google.com [209.85.214.52]) by fiordland.canonical.com (Postfix) with ESMTP id 77F40A18471 for ; Thu, 19 Jan 2012 15:05:17 +0000 (UTC) Received: by bkbzt4 with SMTP id zt4so23207bkb.11 for ; Thu, 19 Jan 2012 07:05:17 -0800 (PST) Received: by 10.205.141.72 with SMTP id jd8mr5719375bkc.135.1326985515768; Thu, 19 Jan 2012 07:05:15 -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.82.144 with SMTP id ac16cs13918bkc; Thu, 19 Jan 2012 07:05:15 -0800 (PST) Received: by 10.216.132.8 with SMTP id n8mr670986wei.35.1326985514081; Thu, 19 Jan 2012 07:05:14 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id x1si13035119wiv.45.2012.01.19.07.05.13 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 19 Jan 2012 07:05:14 -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 1RntY9-0007HE-Cl for ; Thu, 19 Jan 2012 15:05:13 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 55F63E043A for ; Thu, 19 Jan 2012 15:05:13 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-dashboard X-Launchpad-Branch: ~linaro-validation/lava-dashboard/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 293 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dashboard/trunk] Rev 293: Merge lp:~zkrynicki/lava-dashboard/fix-migration-0012 Message-Id: <20120119150513.4608.28253.launchpad@ackee.canonical.com> Date: Thu, 19 Jan 2012 15:05:13 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14692"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 4c9325c40bee33afc5a4a7bd24625975d0d2d307 Merge authors: Zygmunt Krynicki (zkrynicki) Related merge proposals: https://code.launchpad.net/~zkrynicki/lava-dashboard/fix-migration-0012/+merge/89245 proposed by: Zygmunt Krynicki (zkrynicki) review: Approve - Paul Larson (pwlars) review: Approve - Spring Zhang (qzhang) ------------------------------------------------------------ revno: 293 [merge] committer: Zygmunt Krynicki branch nick: trunk timestamp: Thu 2012-01-19 16:02:55 +0100 message: Merge lp:~zkrynicki/lava-dashboard/fix-migration-0012 modified: dashboard_app/migrations/0012_auto__del_field_bundle_content__add_field_bundle__raw_content__add_fie.py --- lp:lava-dashboard https://code.launchpad.net/~linaro-validation/lava-dashboard/trunk You are subscribed to branch lp:lava-dashboard. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dashboard/trunk/+edit-subscription === modified file 'dashboard_app/migrations/0012_auto__del_field_bundle_content__add_field_bundle__raw_content__add_fie.py' --- dashboard_app/migrations/0012_auto__del_field_bundle_content__add_field_bundle__raw_content__add_fie.py 2011-12-19 23:03:42 +0000 +++ dashboard_app/migrations/0012_auto__del_field_bundle_content__add_field_bundle__raw_content__add_fie.py 2012-01-19 14:39:18 +0000 @@ -9,7 +9,7 @@ def forwards(self, orm): # Adding field 'Bundle._gz_content' - db.add_column('dashboard_app_bundle', '_gz_content', self.gf('dashboard_app.models.GzFileField')(max_length=100, null=True, db_column='gz_content'), keep_default=False) + db.add_column('dashboard_app_bundle', '_gz_content', self.gf('django.db.models.fields.files.FileField')(max_length=100, null=True, db_column='gz_content'), keep_default=False) def backwards(self, orm): @@ -67,7 +67,7 @@ }, 'dashboard_app.bundle': { 'Meta': {'ordering': "['-uploaded_on']", 'object_name': 'Bundle'}, - '_gz_content': ('dashboard_app.models.GzFileField', [], {'max_length': '100', 'null': 'True', 'db_column': "'gz_content'"}), + '_gz_content': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'db_column': "'gz_content'"}), '_raw_content': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'db_column': "'content'"}), 'bundle_stream': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'bundles'", 'to': "orm['dashboard_app.BundleStream']"}), 'content_filename': ('django.db.models.fields.CharField', [], {'max_length': '256'}),