Merge remote-tracking branch 'upstream/main'

elastic · Jun 28, 2024 · c8bf5e1 · c8bf5e1
2 parents 85258db + 60754cb
commit c8bf5e1
Show file tree

Hide file tree

Showing 3 changed files with 156 additions and 151 deletions.
diff --git a/.env b/.env
@@ -1,7 +1,7 @@
 
 
 # Demo App version
-IMAGE_VERSION=1.10.0
+IMAGE_VERSION=1.11.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.11.0
+
 * [accountingservice] convert from Go service to .NET service, uses
   OpenTelemetry .NET Automatic Instrumentation.
   ([#1538](https://github.com/open-telemetry/opentelemetry-demo/pull/1538))