Merge branch 'master' into develop

SUNET · Sep 25, 2023 · ea46777 · ea46777
2 parents dd461cd + 326dc33
commit ea46777
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/docker/api/Dockerfile b/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

diff --git a/docker/docker-compose.yaml b/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

diff --git a/docs/changelog/index.rst b/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
 -------------
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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
		-------------

Expand Down