Skip to content
This repository has been archived by the owner on Mar 3, 2023. It is now read-only.

Fix conflict Rocky8 #3787

Merged
merged 1 commit into from
Mar 6, 2022
Merged

Conversation

thinker0
Copy link
Member

@thinker0 thinker0 commented Mar 6, 2022

Fix merge conflict docker of Rocky8

================================================================================
INFO: Elapsed time: 1419.294s, Critical Path: 334.19s
INFO: 3608 processes: 1160 internal, 2448 local.
INFO: Build completed successfully, 3608 total actions
Test cases: finished with 1189 passing and 0 failing out of 1189 test cases

Executed 247 out of 247 tests: 247 tests pass.
INFO: Build completed successfully, 3608 total actions
Cleaning up scratch dir

@nicknezis
Copy link
Contributor

Thank you! With both PRs changing the original centos7 files, it definitely was a tricky rebase. And my git-fu is not strong enough so I had to fumble my way through.

@thinker0
Copy link
Member Author

thinker0 commented Mar 6, 2022

Thanks ^^;

@nicknezis nicknezis merged commit 4f27c18 into apache:master Mar 6, 2022
@thinker0 thinker0 deleted the feature/fix-conflict-rocky8 branch March 7, 2022 01:07
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants