From 4308b8a4a532047ce17f411d20f35125fdda3f73 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 4 Apr 2017 15:46:27 -0400 Subject: [PATCH 1/3] Fixes #1034: Missing migration --- .../0005_useraction_add_bulk_create.py | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 netbox/extras/migrations/0005_useraction_add_bulk_create.py diff --git a/netbox/extras/migrations/0005_useraction_add_bulk_create.py b/netbox/extras/migrations/0005_useraction_add_bulk_create.py new file mode 100644 index 000000000..0f20e5214 --- /dev/null +++ b/netbox/extras/migrations/0005_useraction_add_bulk_create.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11 on 2017-04-04 19:45 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('extras', '0004_topologymap_change_comma_to_semicolon'), + ] + + operations = [ + migrations.AlterField( + model_name='useraction', + name='action', + field=models.PositiveSmallIntegerField(choices=[(1, b'created'), (7, b'bulk created'), (2, b'imported'), (3, b'modified'), (4, b'bulk edited'), (5, b'deleted'), (6, b'bulk deleted')]), + ), + ] From a18e1a0161eb229968539d69521ab04cbafff8c0 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 4 Apr 2017 15:47:25 -0400 Subject: [PATCH 2/3] Release v1.9.4-r1 --- netbox/netbox/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 7de424bbf..12377f9af 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -12,7 +12,7 @@ except ImportError: "the documentation.") -VERSION = '1.9.5-dev' +VERSION = '1.9.4-r1' # Import local configuration for setting in ['ALLOWED_HOSTS', 'DATABASE', 'SECRET_KEY']: From 78adaecb8942239af03f1a0991278c32beff3556 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 4 Apr 2017 15:50:59 -0400 Subject: [PATCH 3/3] Post-release version bump --- netbox/netbox/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 12377f9af..7de424bbf 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -12,7 +12,7 @@ except ImportError: "the documentation.") -VERSION = '1.9.4-r1' +VERSION = '1.9.5-dev' # Import local configuration for setting in ['ALLOWED_HOSTS', 'DATABASE', 'SECRET_KEY']: