Skip to content

Commit 86b01d2

Browse files
committed
Merge remote-tracking branch 'upstream/main' into fix-11714
2 parents ee83506 + a1cc1ba commit 86b01d2

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.github/workflows/bump-otel-version.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ name: bump-otel-version
22

33
on:
44
workflow_dispatch:
5-
schedule:
6-
- cron: '24 5 * * 1-5'
5+
# Disabled because we do the updates manually, due to upstream dependencies like beats and elastic components
6+
#schedule:
7+
#- cron: '24 5 * * 1-5'
78

89
permissions:
910
contents: read

dev-tools/notice/rules.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
],
1616
"maybelist": [
1717
"EPL-1.0",
18+
"EPL-2.0",
1819
"GPL-3.0"
1920
]
2021
}

0 commit comments

Comments
 (0)