Merge branch 'develop' into develop-2.8

2020-03-15 00:18:32 -04:00
parent 36130965f2 9466802a95
commit 9df238c5f2
36 changed files with 464 additions and 230 deletions
--- a/netbox/extras/tests/test_api.py
+++ b/netbox/extras/tests/test_api.py
@@ -9,6 +9,7 @@ from dcim.models import Device, DeviceRole, DeviceType, Manufacturer, Platform,
 from extras.api.views import ScriptViewSet
 from extras.models import ConfigContext, Graph, ExportTemplate, Tag
 from extras.scripts import BooleanVar, IntegerVar, Script, StringVar
+from extras.utils import FeatureQuerySet
 from tenancy.models import Tenant, TenantGroup
 from utilities.testing import APITestCase