diff options
| -rw-r--r-- | bitbake/lib/toaster/bldcontrol/migrations/0003_auto_20160120_1250.py (renamed from bitbake/lib/toaster/bldcontrol/migrations/0002_auto_20160120_1250.py) | 2 | ||||
| -rw-r--r-- | bitbake/lib/toaster/bldcontrol/migrations/0003_merge.py | 15 | ||||
| -rw-r--r-- | bitbake/lib/toaster/orm/migrations/0006_add_cancelled_state.py | 1 | ||||
| -rw-r--r-- | bitbake/lib/toaster/orm/migrations/0007_merge.py | 15 |
4 files changed, 2 insertions, 31 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/migrations/0002_auto_20160120_1250.py b/bitbake/lib/toaster/bldcontrol/migrations/0003_auto_20160120_1250.py index 0c2475aba5d..b786aeb0425 100644 --- a/bitbake/lib/toaster/bldcontrol/migrations/0002_auto_20160120_1250.py +++ b/bitbake/lib/toaster/bldcontrol/migrations/0003_auto_20160120_1250.py @@ -7,7 +7,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('bldcontrol', '0001_initial'), + ('bldcontrol', '0002_add_cancelling_state'), ] operations = [ diff --git a/bitbake/lib/toaster/bldcontrol/migrations/0003_merge.py b/bitbake/lib/toaster/bldcontrol/migrations/0003_merge.py deleted file mode 100644 index b0f6b163b2f..00000000000 --- a/bitbake/lib/toaster/bldcontrol/migrations/0003_merge.py +++ /dev/null @@ -1,15 +0,0 @@ -# -*- 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/0006_add_cancelled_state.py b/bitbake/lib/toaster/orm/migrations/0006_add_cancelled_state.py index f8ec65af2d8..0c5b1ef360b 100644 --- a/bitbake/lib/toaster/orm/migrations/0006_add_cancelled_state.py +++ b/bitbake/lib/toaster/orm/migrations/0006_add_cancelled_state.py @@ -8,6 +8,7 @@ class Migration(migrations.Migration): dependencies = [ ('orm', '0004_provides'), + ('orm', '0005_task_field_separation'), ] operations = [ diff --git a/bitbake/lib/toaster/orm/migrations/0007_merge.py b/bitbake/lib/toaster/orm/migrations/0007_merge.py deleted file mode 100644 index 5d92f336198..00000000000 --- a/bitbake/lib/toaster/orm/migrations/0007_merge.py +++ /dev/null @@ -1,15 +0,0 @@ -# -*- 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', '0006_remove_build_build_name'), - ] - - operations = [ - ] |