konlue commented on PR #7677: URL: https://github.com/apache/shenyu/pull/7677#issuecomment-6262083888
Merged latest `master` into this branch. (The rename fix itself is the "Merge master into rename branch" commit `ea73fc7c5`; the tip merge on top just reconciles history with the earlier conflict resolution.) - **Resolved new merge conflicts**: the two new `setLoged` call sites that came in from #7663 (`AbstractShenyuPluginTest` 311/331) are renamed to `setLogged`, and two assertion-message strings picked up from `master` now say `logged` too — `grep -in loged` over this file is back to zero. - **MySQL compatibility note**: addressed the note in `db/upgrade/upgrade-guide.md`. The script's `ALTER TABLE ... RENAME COLUMN` requires MySQL 8.0+, with the `CHANGE COLUMN` equivalent spelled out for 5.7. - **Dashboard counterpart**: remains queued as apache/shenyu-dashboard#723. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
