From 7c2e60477398dd7e0376dd8d3b763a23d601dc00 Mon Sep 17 00:00:00 2001 From: Khanh Nguyen Date: Thu, 19 Jan 2023 03:23:30 -0500 Subject: [PATCH] Merge from main --- CHANGELOG.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d6e1d61b0a..faeda252f2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,9 +21,6 @@ release. ### Compatibility -- Add condition with sum and count for Prometheus summaries -([3059](https://github.com/open-telemetry/opentelemetry-specification/pull/3059)) - ### OpenTelemetry Protocol ### SDK Configuration @@ -105,6 +102,8 @@ release. - Add OpenCensus migration guide and add BinaryPropagation as an option to gRPC instrumentation for OpenCensus compatibility ([#3015](https://github.com/open-telemetry/opentelemetry-specification/pull/3015)). +- Add condition with sum and count for Prometheus summaries +([3059](https://github.com/open-telemetry/opentelemetry-specification/pull/3059)) ### OpenTelemetry Protocol