Skip to content

Conversation

eerhardt
Copy link
Member

This brings in AOT support open-telemetry/opentelemetry-dotnet-contrib#1415

Splitting this from #597 to ensure it gets in, if we don't want the Log changes.

@eerhardt eerhardt enabled auto-merge (squash) October 31, 2023 20:18
@eerhardt eerhardt merged commit ac53446 into main Oct 31, 2023
@eerhardt eerhardt deleted the UpdateRedisOTel branch October 31, 2023 20:27
@eerhardt
Copy link
Member Author

/backport to release/8.0-preview1

Copy link
Contributor

Started backporting to release/8.0-preview1: https://github.com/dotnet/aspire/actions/runs/6712209353

Copy link
Contributor

@eerhardt backporting to release/8.0-preview1 failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Patch format detection failed.
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

Copy link
Contributor

@eerhardt an error occurred while backporting to release/8.0-preview1, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

@danmoseley danmoseley added area-integrations Issues pertaining to Aspire Integrations packages area-codeflow for labeling automated codeflow. intentionally a different color! and removed area-integrations Issues pertaining to Aspire Integrations packages labels Nov 16, 2023
@github-actions github-actions bot locked and limited conversation to collaborators Apr 30, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-codeflow for labeling automated codeflow. intentionally a different color!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants