Skip to content

Commit 0e34fba

Browse files
Merge pull request #17478 from netbox-community/develop
Release v4.1.1
2 parents 7bc0d34 + 15a106b commit 0e34fba

File tree

118 files changed

+56642
-133462
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+56642
-133462
lines changed

.github/ISSUE_TEMPLATE/feature_request.yaml renamed to .github/ISSUE_TEMPLATE/01-feature_request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ body:
1414
attributes:
1515
label: NetBox version
1616
description: What version of NetBox are you currently running?
17-
placeholder: v4.1.0
17+
placeholder: v4.1.1
1818
validations:
1919
required: true
2020
- type: dropdown

.github/ISSUE_TEMPLATE/bug_report.yaml renamed to .github/ISSUE_TEMPLATE/02-bug_report.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ body:
2626
attributes:
2727
label: NetBox Version
2828
description: What version of NetBox are you currently running?
29-
placeholder: v4.1.0
29+
placeholder: v4.1.1
3030
validations:
3131
required: true
3232
- type: dropdown

.github/workflows/close-stale-issues.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ jobs:
4545
This PR has been automatically closed due to lack of activity.
4646
days-before-pr-stale: 15
4747
days-before-pr-close: 15
48+
exempt-pr-labels: 'status: blocked'
4849
stale-pr-label: 'pending closure'
4950
stale-pr-message: >
5051
This PR has been automatically marked as stale because it has not had

base_requirements.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,6 @@ Jinja2
8484
# https://python-markdown.github.io/changelog/
8585
Markdown
8686

87-
# File inclusion plugin for Python-Markdown
88-
# https://github.com/cmacmackin/markdown-include
89-
markdown-include
90-
9187
# MkDocs Material theme (for documentation build)
9288
# https://squidfunk.github.io/mkdocs-material/changelog/
9389
mkdocs-material

contrib/apache.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
Alias /static /opt/netbox/netbox/static
2121

2222
<Directory /opt/netbox/netbox/static>
23-
Options Indexes FollowSymLinks MultiViews
23+
Options FollowSymLinks MultiViews
2424
AllowOverride None
2525
Require all granted
2626
</Directory>

contrib/generated_schema.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@
149149
"nema-l15-60p",
150150
"nema-l21-20p",
151151
"nema-l21-30p",
152+
"nema-l22-20p",
152153
"nema-l22-30p",
153154
"cs6361c",
154155
"cs6365c",
@@ -262,6 +263,7 @@
262263
"nema-l15-60r",
263264
"nema-l21-20r",
264265
"nema-l21-30r",
266+
"nema-l22-20r",
265267
"nema-l22-30r",
266268
"CS6360C",
267269
"CS6364C",
@@ -518,6 +520,14 @@
518520
"urm-p4",
519521
"urm-p8",
520522
"splice",
523+
"usb-a",
524+
"usb-b",
525+
"usb-c",
526+
"usb-mini-a",
527+
"usb-mini-b",
528+
"usb-micro-a",
529+
"usb-micro-b",
530+
"usb-micro-ab",
521531
"other"
522532
]
523533
}
@@ -575,6 +585,14 @@
575585
"urm-p4",
576586
"urm-p8",
577587
"splice",
588+
"usb-a",
589+
"usb-b",
590+
"usb-c",
591+
"usb-mini-a",
592+
"usb-mini-b",
593+
"usb-micro-a",
594+
"usb-micro-b",
595+
"usb-micro-ab",
578596
"other"
579597
]
580598
}

0 commit comments

Comments
 (0)