weizhouapache commented on a change in pull request #4259:
URL: https://github.com/apache/cloudstack/pull/4259#discussion_r712219880
##########
File path:
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
##########
@@ -1302,11 +1304,21 @@ public boolean configureHostParams(final Map<String,
String> params) {
storage.persist("router.aggregation.command.each.timeout",
String.valueOf(longValue));
}
+<<<<<<< HEAD
Review comment:
@ravening
this needs to be fixed :-D
--
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]
