Merge remote-tracking branch 'upstream/main'

elastic · Nov 4, 2024 · 6eedc62 · 6eedc62
2 parents 94cebd0 + 1e1a2ba
commit 6eedc62
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.env b/.env
@@ -1,7 +1,7 @@
 
 
 # Demo App version
-IMAGE_VERSION=1.11.1
+IMAGE_VERSION=1.12.0
 IMAGE_NAME=ghcr.io/open-telemetry/demo
 DEMO_VERSION=latest
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@ the release.
 
 ## Unreleased
 
+## 1.12.0
+
 * [accountingservice] allow running the container with non root user
   ([#1692](https://github.com/open-telemetry/opentelemetry-demo/pull/1692))
 * [chore] Add yamllint to `make all`