Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[chore] Merge release/v0.102.x into main second replacement #10329

Merged
merged 4 commits into from
Jun 5, 2024
Merged

[chore] Merge release/v0.102.x into main second replacement #10329

merged 4 commits into from
Jun 5, 2024

Commits on Jun 5, 2024

  1. [chore] update go to 1.21.11/1.22.4 (open-telemetry#10321) (open-tele… 

    …metry#10325)

Backport of open-telemetry#10321

Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com>
Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com>
    @mx-psi @codeboten
    mx-psi and codeboten committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    0ab388b View commit details
    Browse the repository at this point in the history

  2. [configgrpc] Use own compressors for zstd (open-telemetry#10323) (ope… 

    …n-telemetry#10324)

Backport of open-telemetry#10323

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>
Co-authored-by: Juraci Paixão Kröhling <juraci@kroehling.de>
    @mx-psi @jpkrohling
    mx-psi and jpkrohling committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    10e89bd View commit details
    Browse the repository at this point in the history

  3. prepare release 0.102.1 (open-telemetry#10326) 

    <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description

Step 2 of release process

> Make sure you are on release/<release-series>. Prepare release commits
with prepare-release make target, e.g. make prepare-release
PREVIOUS_VERSION=0.90.0 RELEASE_CANDIDATE=0.90.1 MODSET=beta, and create
a pull request against the release/<release-series> branch.
    @mx-psi
    mx-psi committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    7218b4c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'release/v0.102.x' into mx-psi/release/v0.102.x-fix-merg… 

    …e-conflicts-v2
    @mx-psi
    mx-psi committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    45a688c View commit details
    Browse the repository at this point in the history