Skip to content

Commit

Permalink
Adjust CHANGELOG per last merge to main.
Browse files Browse the repository at this point in the history
  • Loading branch information
marcalff committed Oct 16, 2023
1 parent 3773619 commit 6b391f6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Increment the:

## [Unreleased]

## [1.12.0] 2023-10-11
## [1.12.0] 2023-10-16

* [BUILD] Support `pkg-config`
[#2269](https://github.com/open-telemetry/opentelemetry-cpp/pull/2269)
Expand Down Expand Up @@ -79,6 +79,10 @@ Increment the:
[#2356](https://github.com/open-telemetry/opentelemetry-cpp/pull/2356)
* [BUILD] Fix protoc searching with non-imported protobuf::protoc target
[#2362](https://github.com/open-telemetry/opentelemetry-cpp/pull/2362)
* [BUILD] Support to use different cmake package CONFIG of dependencies
[#2263](https://github.com/open-telemetry/opentelemetry-cpp/pull/2263)
* [SEMANTIC CONVENTION] Upgrade to semconv 1.22.0
[#2368](https://github.com/open-telemetry/opentelemetry-cpp/pull/2368)

Important changes:

Expand Down
2 changes: 1 addition & 1 deletion sdk/src/version/version.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const char *pre_release = "NONE";
const char *build_metadata = "NONE";
const char *short_version = "1.12.0";
const char *full_version = "1.12.0-NONE-NONE";
const char *build_date = "Wed 11 Oct 2023 06:36:17 PM UTC";
const char *build_date = "Mon 16 Oct 2023 07:42:23 AM UTC";

} // namespace version
} // namespace sdk
Expand Down

0 comments on commit 6b391f6

Please sign in to comment.