Merge branch 'develop' into develop-2.1

Conflicts: netbox/netbox/settings.py
2017-07-14 10:12:35 -04:00
parent b2d3f3ff22 0655834938
commit e8dafc02f7
6 changed files with 13 additions and 9 deletions
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -264,7 +264,7 @@ class PrefixCSVForm(forms.ModelForm):
        required=False
    )
    status = CSVChoiceField(
-        choices=IPADDRESS_STATUS_CHOICES,
+        choices=PREFIX_STATUS_CHOICES,
        help_text='Operational status'
    )
    role = forms.ModelChoiceField(