Skip to content

Commit 4f616fd

Browse files
authored
Merge branch 'main' into feat/strarlette_exclude_spans
2 parents 6a36ed4 + 00498c7 commit 4f616fd

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

.github/workflows/changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
- name: Ensure no direct changes to CHANGELOG.md
3232
run: |
33-
if [[ $(git diff --name-only FETCH_HEAD -- '**/CHANGELOG.md') ]]
33+
if [[ $(git diff --name-only FETCH_HEAD -- 'CHANGELOG.md' '**/CHANGELOG.md') ]]
3434
then
3535
echo "CHANGELOG.md files should not be directly modified."
3636
echo "Please add a changelog fragment file to the appropriate .changelog/ directory instead."

tests/opentelemetry-docker-tests/tests/test-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ SQLAlchemy==1.4.52
5454
tomli==2.0.1
5555
typing_extensions==4.12.2
5656
tzdata==2024.1
57-
urllib3==2.6.3
57+
urllib3==2.7.0
5858
vine==5.1.0
5959
wcwidth==0.2.13
6060
wrapt==1.16.0

0 commit comments

Comments
 (0)