Skip to content

Commit 5c77655

Browse files
authored
Update changelog for 1.20.1 patch release (#4953)
* Update changelog for 1.20.1 patch release * Disable jApiCmp diff check on release branches * Disable japicmp when base_ref is release
1 parent 6de8e97 commit 5c77655

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ jobs:
6060
-Porg.gradle.java.installations.paths=${{ steps.setup-java-test.outputs.path }},${{ steps.setup-java.outputs.path }}
6161
6262
- name: Check for diff
63+
# The jApiCmp diff compares current to latest, which isn't appropriate for release branches
64+
if: ${{ !startsWith(github.ref_name, 'release/') && !startsWith(github.base_ref, 'release/') }}
6365
run: |
6466
if git diff --quiet
6567
then

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Changelog
22

3+
## Unreleased
4+
5+
### Bugfixes
6+
7+
* Fix bug in `ComponentRegistry` that produces `ConcurrentModificationException` when reading
8+
metrics at the same time as obtaining a meter.
9+
[(#4951)](https://github.com/open-telemetry/opentelemetry-java/pull/4951)
10+
311
## Version 1.20.0 (2022-11-11)
412

513
### API

0 commit comments

Comments
 (0)