Merge branch 'master' into develop

Author: indy-independence

docker/api/Dockerfile

@@ -66,7 +66,7 @@ USER www-data
 RUN mkdir /tmp/devicecerts \
     && chmod -R u=rwX,g=,o= /tmp/devicecerts
 
-ARG BUILDBRANCH=develop
+ARG BUILDBRANCH=master
 ARG GITREPO_BASE=https://github.com/SUNET/cnaas-nms.git
 # Branch specific, don't cache
 ADD "https://api.github.com/repos/SUNET/cnaas-nms/git/refs/heads/" latest_commit

docker/docker-compose.yaml

@@ -9,7 +9,7 @@ services:
     build:
       context: ./api/
       args:
-        - BUILDBRANCH=develop
+        - BUILDBRANCH=master
         - GITREPO_BASE=https://github.com/SUNET/cnaas-nms.git
     ports:
       - 443:1443

docs/changelog/index.rst

@@ -30,7 +30,6 @@ Bug fixes:
 
  - Fix ZTP of access switch connected to another access switch with type downlink but empty data
 
-
 Version 1.4.1
 -------------