Merge remote-tracking branch 'mainRepo/master' into feature/6561/invoices-webhook

hosting/migrations/0053_hostingbilllineitem_stripe_plan.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2019-04-20 10:10
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('datacenterlight', '0028_stripeplan_stripe_plan_name'),
+        ('hosting', '0052_hostingbilllineitem'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='hostingbilllineitem',
+            name='stripe_plan',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='datacenterlight.StripePlan'),
+        ),
+    ]

hosting/migrations/0054_auto_20190508_2141.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2019-05-08 21:41
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('hosting', '0053_hostingbilllineitem_stripe_plan'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='vmdetail',
+            name='configuration',
+            field=models.CharField(default='', max_length=128),
+        ),
+    ]