samuhasavak5 commented on PR #1412: URL: https://github.com/apache/knox/pull/1412#issuecomment-5757703137
> @samuhasavak5 - please note that this PR will result in conflicts with #1411 as it's impossible for Git to resolve some additions here and there. For instance: > > ``` > <value>LIVYSERVER,LIVY_FOR_SPARK3</value> > vs. > <value>LIVYSERVER,LIVY_FOR_SPARK4</value> > in gateway-site.xml. > ``` > > Thus, I'm going to merge #1411 and you have to rebase your changes and update this PR. Thanks! Thanks @smolnar82 — rebased onto current master after #1411 merge and resolved the overlapping edits: - gateway-site.xml: LIVYSERVER,LIVY_FOR_SPARK3,LIVY_FOR_SPARK4 - Admin wizard, CM ServiceModelGenerator SPI, and ClouderaManagerServiceDiscoveryTest: kept #1411 (Spark 3) entries and added Spark 4 Local mvn -pl gateway-service-definitions,gateway-discovery-cm -am test -DskipITs passed. Branch updated; -- 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]
