diff mbox

[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
State Accepted
Headers show

Commit Message

Zygmunt Krynicki Jan. 19, 2012, 3:05 p.m. UTC 
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 <zygmunt.krynicki@linaro.org>
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
diff mbox

Patch

=== 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'}),