Merge branch 'master' into bugfix/6669/opennebula-vm-query-takes-long
This commit is contained in:
commit
8afed25d04
2 changed files with 21 additions and 1 deletions
20
hosting/migrations/0054_auto_20190508_2141.py
Normal file
20
hosting/migrations/0054_auto_20190508_2141.py
Normal file
|
@ -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),
|
||||
),
|
||||
]
|
|
@ -538,7 +538,7 @@ class VMDetail(models.Model):
|
|||
disk_size = models.FloatField(default=0.0)
|
||||
cores = models.FloatField(default=0.0)
|
||||
memory = models.FloatField(default=0.0)
|
||||
configuration = models.CharField(default='', max_length=25)
|
||||
configuration = models.CharField(default='', max_length=128)
|
||||
ipv4 = models.TextField(default='')
|
||||
ipv6 = models.TextField(default='')
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
|
|
Loading…
Reference in a new issue