andrijapanicsb commented on pull request #4250: URL: https://github.com/apache/cloudstack/pull/4250#issuecomment-678985501
The previous centos7 build failed due to: `From https://github.com/apache/cloudstack * [new ref] refs/pull/4141/head -> pr/4141 Auto-merging server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml Auto-merging server/src/main/java/com/cloud/server/ManagementServerImpl.java Auto-merging server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java Auto-merging server/src/main/java/com/cloud/api/ApiResponseHelper.java Auto-merging engine/schema/src/main/resources/META-INF/db/schema-41400to41500.sql CONFLICT (content): Merge conflict in engine/schema/src/main/resources/META-INF/db/schema-41400to41500.sql Auto-merging engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml Auto-merging api/src/main/java/org/apache/cloudstack/api/BaseCmd.java Auto-merging api/src/main/java/org/apache/cloudstack/api/ApiConstants.java Auto-merging api/src/main/java/com/cloud/event/EventTypes.java Automatic merge failed; fix conflicts and then commit the result. ERROR: Merge failed, aborting.` ---------------------------------------------------------------- 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
