From b5ad29e3f27e48d96936faddda5894b29a217913 Mon Sep 17 00:00:00 2001
From: jeremystretch <jeremy@netverity.dev>
Date: Wed, 7 Apr 2021 15:17:02 -0400
Subject: [PATCH] Fixes #6100: Fix VM interfaces table "add interfaces" link

---
 docs/release-notes/version-2.11.md                     | 10 +++++++++-
 netbox/netbox/settings.py                              |  2 +-
 .../virtualization/virtualmachine/interfaces.html      |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/docs/release-notes/version-2.11.md b/docs/release-notes/version-2.11.md
index bf1914ba4..b3f68f8e9 100644
--- a/docs/release-notes/version-2.11.md
+++ b/docs/release-notes/version-2.11.md
@@ -1,6 +1,14 @@
 # NetBox v2.11
 
-## v2.11-beta1 (2021-04-07)
+## v2.11.0 (FUTURE)
+
+### Bug Fixes (from Beta)
+
+* [#6100](https://github.com/netbox-community/netbox/issues/6100) - Fix VM interfaces table "add interfaces" link
+
+---
+
+## v2.11-beta1 (2021-04-06)
 
 **WARNING:** This is a beta release and is not suitable for production use. It is intended for development and evaluation purposes only. No upgrade path to the final v2.11 release will be provided from this beta, and users should assume that all data entered into the application will be lost.
 
diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index bd9b0e44c..dd3de6fa0 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -16,7 +16,7 @@ from django.core.validators import URLValidator
 # Environment setup
 #
 
-VERSION = '2.11-beta1'
+VERSION = '2.11.0-dev'
 
 # Hostname
 HOSTNAME = platform.node()
diff --git a/netbox/templates/virtualization/virtualmachine/interfaces.html b/netbox/templates/virtualization/virtualmachine/interfaces.html
index 15d07310c..f45c990eb 100644
--- a/netbox/templates/virtualization/virtualmachine/interfaces.html
+++ b/netbox/templates/virtualization/virtualmachine/interfaces.html
@@ -35,7 +35,7 @@
                 {% endif %}
                 {% if perms.virtualization.add_vminterface %}
                     <div class="pull-right">
-                        <a href="{% url 'virtualization:vminterface_add' %}?virtualmachine={{ object.pk }}&return_url={% url 'virtualization:virtualmachine_interfaces' pk=object.pk %}" class="btn btn-primary btn-xs">
+                        <a href="{% url 'virtualization:vminterface_add' %}?virtual_machine={{ object.pk }}&return_url={% url 'virtualization:virtualmachine_interfaces' pk=object.pk %}" class="btn btn-primary btn-xs">
                             <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add interfaces
                         </a>
                     </div>