Skip to content

Commit

Permalink
Rebase from v1.1.1
Browse files Browse the repository at this point in the history
Signed-off-by: owentou <[email protected]>
  • Loading branch information
owent committed Dec 22, 2021
1 parent 2463784 commit 60826d9
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ Increment the:

## [Unreleased]

## [1.1.1] 2021-12-20
* [SDK] Add LogLevel to internal_log ([#1147](https:/open-telemetry/opentelemetry-cpp/pull/1147))

## [1.1.1] 2021-12-

* [SDK] Rename OTEL_CPP_GET_ATTR macro, and define it using fully qualified attr function ([#1140](https:/open-telemetry/opentelemetry-cpp/pull/1140))
* [SDK] Default resource attributes and attributes in OTEL_RESOURCE_ATTRIBUTES are missing when using Otlp*LogExporter ([#1082](https:/open-telemetry/opentelemetry-cpp/pull/1082))
Expand Down

0 comments on commit 60826d9

Please sign in to comment.