Merge pull request #419 from netbox-community/develop

Version 1.0.1
Merge branch 'release' into develop
2021-02-03 15:30:31 +01:00 · 2021-02-03 15:01:11 +01:00 · 2021-02-03 14:52:21 +01:00 · 2021-01-31 21:38:49 +01:00 · 2021-01-31 16:39:45 +01:00 · 2021-01-31 16:07:40 +01:00
4 changed files with 4 additions and 4 deletions
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@ -27,7 +27,7 @@ jobs:
    steps:
    - id: git-checkout
      name: Checkout
-      uses: actions/checkout@v1
+      uses: actions/checkout@v2
    - id: docker-build
      name: Build the image from '${{ matrix.docker_from }}' with '${{ matrix.build_cmd }}'
      run: ${{ matrix.build_cmd }}
--- a/2
+++ b/2
@ -1 +1 @@
-1.0.0
+1.0.1
--- a/docker/launch-netbox.sh
+++ b/docker/launch-netbox.sh
@ -7,7 +7,7 @@ load_configuration() {
  MAX_WAIT=10
  WAIT_COUNT=0
  while [ ! -S $UNIT_SOCKET ]; do
-    if [ $WAIT_COUNT -gte $MAX_WAIT ]; then
+    if [ $WAIT_COUNT -ge $MAX_WAIT ]; then
      echo "⚠️ No control socket found; configuration will not be loaded."
      return 1
    fi
--- a/requirements-container.txt
+++ b/requirements-container.txt
@ -1,4 +1,4 @@
 napalm==3.2.0
 ruamel.yaml==0.16.12
 django-auth-ldap==2.2.0
-django-storages==1.10.1
+django-storages==1.11.1
Author	SHA1	Message	Date
Christian Mäder	4dd7a51c7d	Merge pull request #419 from netbox-community/develop Version 1.0.1	2021-02-03 15:30:31 +01:00
Christian Mäder	c7e259e116	Merge branch 'release' into develop	2021-02-03 15:01:11 +01:00
Christian Mäder	3cbe07cb0e	Preparation for 1.0.1	2021-02-03 14:52:21 +01:00
Tobias Genannt	70b38d52b9	Merge pull request #413 from tobiasge/fix-412 Is greater than or equal to is "-ge" and not "-gte".	2021-01-31 21:38:49 +01:00
Tobias Genannt	a21d146b60	Is greater than or equal to is "-ge" and not "-gte".	2021-01-31 16:39:45 +01:00
Christian Mäder	6e7a64bd81	Merge pull request #410 from netbox-community/renovate/django-storages-1.x Update dependency django-storages to v1.11.1	2021-01-31 16:07:40 +01:00
Renovate Bot	f8360ba6aa	Update dependency django-storages to v1.11.1	2021-01-31 14:42:24 +00:00
Christian Mäder	bab8373f66	Merge pull request #411 from netbox-community/renovate/actions-checkout-2.x Update actions/checkout action to v2	2021-01-31 15:41:41 +01:00
Renovate Bot	ad93c99f46	Update actions/checkout action to v2	2021-01-31 11:55:20 +00:00
 @ -1 +1 @@
 .0.0
 .0.1