BewareMyPower commented on pull request #13243: URL: https://github.com/apache/pulsar/pull/13243#issuecomment-991770173
https://github.com/apache/pulsar/pull/9607 also needs to be cherry-picked. But I encountered a conflict in pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionTlsTest.java. Please help resolve the conflict since I didn't have much context about why line 131 in following code was removed. ```java 130 <<<<<<< HEAD 131 when(functionsWorkerService.getBrokerAdmin()).thenReturn(admin); 132 Set<String> admins = Sets.newHashSet("superUser"); 133 ======= 134 Set<String> admins = Sets.newHashSet("superUser", "admin"); 135 >>>>>>> 2e0876612c7... Fix expired tls certs for cpp tests (#9607) ``` -- 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]
