Merge branch 'develop' into develop-2.8

2020-03-27 12:53:55 -04:00
parent ced6fe313a 5cf872d000
commit a72d5c899e
19 changed files with 511 additions and 139 deletions
--- a/netbox/dcim/api/views.py
+++ b/netbox/dcim/api/views.py
@@ -48,7 +48,7 @@ class CableTraceMixin(object):
        # Initialize the path array
        path = []

-        for near_end, cable, far_end in obj.trace(follow_circuits=True):
+        for near_end, cable, far_end in obj.trace():

            # Serialize each object
            serializer_a = get_serializer_for_model(near_end, prefix='Nested')