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/views.py
This commit is contained in:
Jeremy Stretch
2017-03-07 14:08:06 -05:00
parent a7a7b956b1 4b753b1610
commit 02e89d77bb
6 changed files with 106 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/extras/management/commands/run_inventory.py
View File

@@ -49,7 +49,7 @@ class Command(BaseCommand):
self.stdout.write("Running inventory for these sites: {}".format(', '.join(site_names)))
else:
raise CommandError("One or more sites specified but none found.")
device_list = device_list.filter(rack__site__in=sites)
device_list = device_list.filter(site__in=sites)
# --name: Filter devices by name matching a regex
if options['name']: