cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ProjectMoon <...@git.apache.org>
Subject [GitHub] cloudstack pull request #1908: CLOUDSTACK-9317: Fixed disable static nat on ...
Date Tue, 11 Apr 2017 09:06:08 GMT
Github user ProjectMoon commented on a diff in the pull request:

    https://github.com/apache/cloudstack/pull/1908#discussion_r110848750
  
    --- 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
     -- CLOUDSTACK-9827: Storage tags stored in multiple places
     DROP VIEW IF EXISTS `cloud`.`storage_tag_view`;
    +
    +ALTER TABLE `user_ip_address` ADD COLUMN `rule_state` VARCHAR(32) COMMENT 'static  rule
state while removing';
    +=======
    --- End diff --
    
    Conflict line.


---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message