summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-03-09 11:33:10 +0200
committerEd Bartosh <ed.bartosh@linux.intel.com>2016-03-11 09:22:16 +0200
commitf62b905002b3b9645517d715f590ad41142a76a3 (patch)
treeb401579659a9403825b0a593e30b02941063a19d
parentf9635cbd92b3b1a0745e9edf3828ed0d2e5a1d75 (diff)
downloadpoky-contrib-ed/toaster/build-cancel.tar.gz
poky-contrib-ed/toaster/build-cancel.tar.bz2
poky-contrib-ed/toaster/build-cancel.zip
toaster: fix conflicting migrationsed/toaster/build-cancel
Fixed migrations by running manage.py makemigrations --merge Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
-rw-r--r--bitbake/lib/toaster/bldcontrol/migrations/0003_merge.py15
-rw-r--r--bitbake/lib/toaster/orm/migrations/0007_merge.py15
2 files changed, 30 insertions, 0 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/migrations/0003_merge.py b/bitbake/lib/toaster/bldcontrol/migrations/0003_merge.py
new file mode 100644
index 00000000000..b0f6b163b2f
--- /dev/null
+++ b/bitbake/lib/toaster/bldcontrol/migrations/0003_merge.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('bldcontrol', '0002_add_cancelling_state'),
+ ('bldcontrol', '0002_auto_20160120_1250'),
+ ]
+
+ operations = [
+ ]
diff --git a/bitbake/lib/toaster/orm/migrations/0007_merge.py b/bitbake/lib/toaster/orm/migrations/0007_merge.py
new file mode 100644
index 00000000000..1c1e07fcc0f
--- /dev/null
+++ b/bitbake/lib/toaster/orm/migrations/0007_merge.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('orm', '0006_add_cancelled_state'),
+ ('orm', '0005_task_field_separation'),
+ ]
+
+ operations = [
+ ]