Github user ProjectMoon commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1908#discussion_r110848709
--- Diff: setup/db/db/schema-4920to41000.sql ---
@@ -230,5 +230,11 @@ JOIN `cloud`.`vm_snapshots` s ON
(s.service_offering_id = o.id AND s.vm_id = v.i
WHERE (o.cpu is null AND o.speed IS NULL AND o.ram_size IS NULL) AND
(d.name = 'cpuNumber' OR d.name = 'cpuSpeed' OR d.name = 'memory');
+<<<<<<< 1c48deefe9b534198cad19b5528ce0dcfa8d04a5
--- End diff --
It seems you got a conflict stuck in the file.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
