Jeremy Stretch 2 лет назад
Родитель
Сommit
90ab4b3c86

+ 1 - 1
.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -14,7 +14,7 @@ body:
     attributes:
     attributes:
       label: NetBox version
       label: NetBox version
       description: What version of NetBox are you currently running?
       description: What version of NetBox are you currently running?
-      placeholder: v3.6.0
+      placeholder: v3.6.1
     validations:
     validations:
       required: true
       required: true
   - type: dropdown
   - type: dropdown

+ 1 - 1
.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -14,7 +14,7 @@ body:
     attributes:
     attributes:
       label: NetBox version
       label: NetBox version
       description: What version of NetBox are you currently running?
       description: What version of NetBox are you currently running?
-      placeholder: v3.6.0
+      placeholder: v3.6.1
     validations:
     validations:
       required: true
       required: true
   - type: dropdown
   - type: dropdown

+ 5 - 1
docs/release-notes/version-3.6.md

@@ -1,6 +1,6 @@
 # NetBox v3.6
 # NetBox v3.6
 
 
-## v3.6.1 (FUTURE)
+## v3.6.1 (2023-09-06)
 
 
 ### Enhancements
 ### Enhancements
 
 
@@ -10,6 +10,7 @@
 
 
 ### Bug Fixes
 ### Bug Fixes
 
 
+* [#12553](https://github.com/netbox-community/netbox/issues/12552) - Ensure `family` attribute is always returned when creating aggregates and prefixes via REST API
 * [#13619](https://github.com/netbox-community/netbox/issues/13619) - Fix exception when viewing IP address assigned to a virtual machine
 * [#13619](https://github.com/netbox-community/netbox/issues/13619) - Fix exception when viewing IP address assigned to a virtual machine
 * [#13596](https://github.com/netbox-community/netbox/issues/13596) - Always display "render config" tab for devices and virtual machines
 * [#13596](https://github.com/netbox-community/netbox/issues/13596) - Always display "render config" tab for devices and virtual machines
 * [#13620](https://github.com/netbox-community/netbox/issues/13620) - Show admin menu items only for staff users
 * [#13620](https://github.com/netbox-community/netbox/issues/13620) - Show admin menu items only for staff users
@@ -20,6 +21,9 @@
 * [#13632](https://github.com/netbox-community/netbox/issues/13632) - Avoid raising exception when checking if FHRP group IP address is primary
 * [#13632](https://github.com/netbox-community/netbox/issues/13632) - Avoid raising exception when checking if FHRP group IP address is primary
 * [#13642](https://github.com/netbox-community/netbox/issues/13642) - Suppress warning about unreflected model changes when applying migrations
 * [#13642](https://github.com/netbox-community/netbox/issues/13642) - Suppress warning about unreflected model changes when applying migrations
 * [#13657](https://github.com/netbox-community/netbox/issues/13657) - Fix decoding of data file content
 * [#13657](https://github.com/netbox-community/netbox/issues/13657) - Fix decoding of data file content
+* [#13674](https://github.com/netbox-community/netbox/issues/13674) - Fix retrieving individual report via REST API
+* [#13682](https://github.com/netbox-community/netbox/issues/13682) - Fix error message returned when validation of custom field default value fails
+* [#13684](https://github.com/netbox-community/netbox/issues/13684) - Enable modying the configuration when maintenance mode is enabled
 
 
 ---
 ---
 
 

+ 1 - 1
netbox/netbox/settings.py

@@ -25,7 +25,7 @@ from netbox.constants import RQ_QUEUE_DEFAULT, RQ_QUEUE_HIGH, RQ_QUEUE_LOW
 # Environment setup
 # Environment setup
 #
 #
 
 
-VERSION = '3.6.1-dev'
+VERSION = '3.6.1'
 
 
 # Hostname
 # Hostname
 HOSTNAME = platform.node()
 HOSTNAME = platform.node()

+ 6 - 6
requirements.txt

@@ -1,5 +1,5 @@
 bleach==6.0.0
 bleach==6.0.0
-Django==4.2.4
+Django==4.2.5
 django-cors-headers==4.2.0
 django-cors-headers==4.2.0
 django-debug-toolbar==4.2.0
 django-debug-toolbar==4.2.0
 django-filter==23.2
 django-filter==23.2
@@ -12,23 +12,23 @@ django-rich==1.7.0
 django-rq==2.8.1
 django-rq==2.8.1
 django-tables2==2.6.0
 django-tables2==2.6.0
 django-taggit==4.0.0
 django-taggit==4.0.0
-django-timezone-field==5.1
+django-timezone-field==6.0
 djangorestframework==3.14.0
 djangorestframework==3.14.0
 drf-spectacular==0.26.4
 drf-spectacular==0.26.4
-drf-spectacular-sidecar==2023.8.1
+drf-spectacular-sidecar==2023.9.1
 feedparser==6.0.10
 feedparser==6.0.10
 graphene-django==3.0.0
 graphene-django==3.0.0
 gunicorn==21.2.0
 gunicorn==21.2.0
 Jinja2==3.1.2
 Jinja2==3.1.2
 Markdown==3.3.7
 Markdown==3.3.7
-mkdocs-material==9.2.5
-mkdocstrings[python-legacy]==0.22.0
+mkdocs-material==9.2.7
+mkdocstrings[python-legacy]==0.23.0
 netaddr==0.8.0
 netaddr==0.8.0
 Pillow==10.0.0
 Pillow==10.0.0
 psycopg[binary,pool]==3.1.10
 psycopg[binary,pool]==3.1.10
 PyYAML==6.0.1
 PyYAML==6.0.1
 sentry-sdk==1.30.0
 sentry-sdk==1.30.0
-social-auth-app-django==5.2.0
+social-auth-app-django==5.3.0
 social-auth-core[openidconnect]==4.4.2
 social-auth-core[openidconnect]==4.4.2
 svgwrite==1.4.3
 svgwrite==1.4.3
 tablib==3.5.0
 tablib==3.5.0