From cd5d0f562c4e32184c263556fc57806103a7865e Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Sat, 4 Aug 2018 08:37:01 +0200
Subject: [PATCH] Simplification et fusion des migrations

---
 ...9_auto_20180625_1700.py => 0087_dnssec.py} |  8 ++---
 .../migrations/0090_auto_20180625_1706.py     | 33 -------------------
 2 files changed, 4 insertions(+), 37 deletions(-)
 rename machines/migrations/{0089_auto_20180625_1700.py => 0087_dnssec.py} (78%)
 delete mode 100644 machines/migrations/0090_auto_20180625_1706.py

diff --git a/machines/migrations/0089_auto_20180625_1700.py b/machines/migrations/0087_dnssec.py
similarity index 78%
rename from machines/migrations/0089_auto_20180625_1700.py
rename to machines/migrations/0087_dnssec.py
index dbaee1a8..cc2a25ec 100644
--- a/machines/migrations/0089_auto_20180625_1700.py
+++ b/machines/migrations/0087_dnssec.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10.7 on 2018-06-25 15:00
+# Generated by Django 1.10.7 on 2018-06-25 15:06
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -8,17 +8,17 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('machines', '0088_dname'),
+        ('machines', '0086_role'),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='extension',
+            model_name='iptype',
             name='dnssec_reverse_v4',
             field=models.BooleanField(default=False, help_text='Activer DNSSEC sur le reverse DNS IPv4'),
         ),
         migrations.AddField(
-            model_name='extension',
+            model_name='iptype',
             name='dnssec_reverse_v6',
             field=models.BooleanField(default=False, help_text='Activer DNSSEC sur le reverse DNS IPv6'),
         ),
diff --git a/machines/migrations/0090_auto_20180625_1706.py b/machines/migrations/0090_auto_20180625_1706.py
deleted file mode 100644
index 9c5e523c..00000000
--- a/machines/migrations/0090_auto_20180625_1706.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.7 on 2018-06-25 15:06
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('machines', '0089_auto_20180625_1700'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='extension',
-            name='dnssec_reverse_v4',
-        ),
-        migrations.RemoveField(
-            model_name='extension',
-            name='dnssec_reverse_v6',
-        ),
-        migrations.AddField(
-            model_name='iptype',
-            name='dnssec_reverse_v4',
-            field=models.BooleanField(default=False, help_text='Activer DNSSEC sur le reverse DNS IPv4'),
-        ),
-        migrations.AddField(
-            model_name='iptype',
-            name='dnssec_reverse_v6',
-            field=models.BooleanField(default=False, help_text='Activer DNSSEC sur le reverse DNS IPv6'),
-        ),
-    ]