mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Merge branch 'develop' into api2

Browse Source 
Conflicts:
	netbox/dcim/api/serializers.py
	netbox/dcim/api/views.py
	netbox/dcim/filters.py
This commit is contained in:
Jeremy Stretch
2017-02-27 17:04:08 -05:00
parent f1518226bd c6970e1998
commit 8f42f59a80
20 changed files with 319 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/dcim/tests/test_apis.py
View File

@ -561,6 +561,7 @@ class InterfaceTest(APITestCase):
'device',
'name',
'form_factor',
'lag',
'mac_address',
'mgmt_only',
'description',
@ -574,6 +575,7 @@ class InterfaceTest(APITestCase):
'device',
'name',
'form_factor',
'lag',
'mac_address',
'mgmt_only',
'description',