From bbb4f482b12bdf2608532b9d41c568a81002c76a Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Fri, 26 May 2023 09:16:08 +0200 Subject: [PATCH] Adjust after merge from main: - release date - changelog --- CHANGELOG.md | 5 +++-- sdk/src/version/version.cc | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e409b02ab..a58e5ad3ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ Increment the: ## [Unreleased] -## [1.9.1] 2023-05-23 +## [1.9.1] 2023-05-26 * [DEPRECATION] Drop C++11 support [#2146](https://github.com/open-telemetry/opentelemetry-cpp/pull/2146) @@ -46,6 +46,8 @@ Increment the: [#2107](https://github.com/open-telemetry/opentelemetry-cpp/pull/2107) * [BUILD] Build break with old curl, macro CURL_VERSION_BITS unknown [#2102](https://github.com/open-telemetry/opentelemetry-cpp/pull/2102) +* [BUILD] Transitive dependency issue with the otlp http exporter + [#2154](https://github.com/open-telemetry/opentelemetry-cpp/pull/2154) * [TEST] Add unit test for log body implicit conversions. [#2136](https://github.com/open-telemetry/opentelemetry-cpp/pull/2136) @@ -62,7 +64,6 @@ Increment the: * [EXPORTER] Fixed HTTP session cleanup on shutdown [#2111](https://github.com/open-telemetry/opentelemetry-cpp/pull/2111) - * [EXPORTER] Delegate all API calls of gRPC into opentelemetry_exporter_otlp_grpc_client, and make it contains all symbols needed. diff --git a/sdk/src/version/version.cc b/sdk/src/version/version.cc index a9d3812610..6dfc299814 100644 --- a/sdk/src/version/version.cc +++ b/sdk/src/version/version.cc @@ -16,13 +16,13 @@ const int minor_version = 9; const int patch_version = 1; const char *pre_release = "NONE"; const char *build_metadata = "NONE"; -const int count_new_commits = 21; +const int count_new_commits = 22; const char *branch = "make_release_1.9.1"; -const char *commit_hash = "61e8741a70cde8f273b3de49a772f05a12566e80"; +const char *commit_hash = "5592180d539b59c4e8293bc927f5a6431fcbacdf"; const char *short_version = "1.9.1"; const char *full_version = - "1.9.1-NONE-NONE-21-make_release_1.9.1-61e8741a70cde8f273b3de49a772f05a12566e80"; -const char *build_date = "Tue 23 May 2023 09:29:31 AM UTC"; + "1.9.1-NONE-NONE-22-make_release_1.9.1-5592180d539b59c4e8293bc927f5a6431fcbacdf"; +const char *build_date = "Fri 26 May 2023 07:14:07 AM UTC"; } // namespace version } // namespace sdk OPENTELEMETRY_END_NAMESPACE