8000 Merge branch 'main' into upgrade_semconv_1.32 · open-telemetry/opentelemetry-cpp@8af63e7 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8af63e7

Browse files
marcalffmarcalff
authored
Merge branch 'main' into upgrade_semconv_1.32
2 parents e5121d7 + 99a0328 commit 8af63e7

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

‎install/conan/conanfile_latest.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ abseil/*:fPIC=True
2626
abseil/*:shared=False
2727
opentracing-cpp/*:fPIC=True
2828
opentracing-cpp/*:shared=True
29+
pcre2/*:with_bzip2=False
2930

3031
[test_requires]
3132
gtest/1.16.0

‎install/conan/conanfile_stable.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ abseil/*:fPIC=True
2626
abseil/*:shared=False
2727
opentracing-cpp/*:fPIC=True
2828
opentracing-cpp/*:shared=True
29+
pcre2/*:with_bzip2=False
2930

3031
[test_requires]
3132
gtest/1.14.0

0 commit comments

Comments
 (0)
0