rajvarun77 commented on PR #3330: URL: https://github.com/apache/brpc/pull/3330#issuecomment-4686301476
Merged the latest master (which now includes the merged #3310) into this branch and resolved the add/add conflict on `test/brpc_mysql_auth_handshake_unittest.cpp` by keeping master's version — it is identical to this branch's copy plus the explicit `main()` that #3310 landed (parses the `-mysql_*` flags for the running-server mode). The branch is mergeable again and CI is re-running. @wwbmmm @yanglimingcn — ready for another look when you have a moment. -- 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] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
