search

apache / incubator-heron

Apache Heron (Incubating) is a realtime, distributed, fault-tolerant stream processing engine from Twitter
https://heron.apache.org/
Apache License 2.0
3.65k stars 598 forks source link

Fix conflict Rocky8 #3787

Closed thinker0 closed 2 years ago

thinker0 commented 2 years ago

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 commented 2 years ago

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 commented 2 years ago

Thanks ^^;