From 49411450af32f2ab5b997cd88abce1953af8a447 Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Tue, 10 Jul 2018 15:34:49 +0200
Subject: [PATCH] Migration preferences ssl + merge

---
 .../migrations/0093_merge_20180710_0226.py    | 16 +++++++++++++++
 ...naltopologie_switchs_web_management_ssl.py | 20 +++++++++++++++++++
 .../migrations/0046_merge_20180710_1533.py    | 16 +++++++++++++++
 3 files changed, 52 insertions(+)
 create mode 100644 machines/migrations/0093_merge_20180710_0226.py
 create mode 100644 preferences/migrations/0045_optionaltopologie_switchs_web_management_ssl.py
 create mode 100644 preferences/migrations/0046_merge_20180710_1533.py

diff --git a/machines/migrations/0093_merge_20180710_0226.py b/machines/migrations/0093_merge_20180710_0226.py
new file mode 100644
index 00000000..c3347890
--- /dev/null
+++ b/machines/migrations/0093_merge_20180710_0226.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-07-10 00:26
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('machines', '0092_auto_20180708_2018'),
+        ('machines', '0083_remove_duplicate_rights'),
+    ]
+
+    operations = [
+    ]
diff --git a/preferences/migrations/0045_optionaltopologie_switchs_web_management_ssl.py b/preferences/migrations/0045_optionaltopologie_switchs_web_management_ssl.py
new file mode 100644
index 00000000..47633c05
--- /dev/null
+++ b/preferences/migrations/0045_optionaltopologie_switchs_web_management_ssl.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-07-09 21:50
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('preferences', '0044_auto_20180709_2237'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='optionaltopologie',
+            name='switchs_web_management_ssl',
+            field=models.BooleanField(default=False, help_text='Web management ssl. Assurez-vous que un certif est installé sur le switch !'),
+        ),
+    ]
diff --git a/preferences/migrations/0046_merge_20180710_1533.py b/preferences/migrations/0046_merge_20180710_1533.py
new file mode 100644
index 00000000..13ffa0d3
--- /dev/null
+++ b/preferences/migrations/0046_merge_20180710_1533.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-07-10 13:33
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('preferences', '0045_remove_unused_payment_fields'),
+        ('preferences', '0045_optionaltopologie_switchs_web_management_ssl'),
+    ]
+
+    operations = [
+    ]