cloudstack-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Alena Prokharchyk (JIRA)" <j...@apache.org>
Subject [jira] [Created] (CLOUDSTACK-1582) Merge conflict caused by merging 4ea36b82e9bb88e75f98982f8c302719f7520f2d from 4.1 to master, wasn't resolved correctly
Date Thu, 07 Mar 2013 21:32:13 GMT
Alena Prokharchyk created CLOUDSTACK-1582:
---------------------------------------------

             Summary: Merge conflict caused by merging 4ea36b82e9bb88e75f98982f8c302719f7520f2d
from 4.1 to master, wasn't resolved correctly
                 Key: CLOUDSTACK-1582
                 URL: https://issues.apache.org/jira/browse/CLOUDSTACK-1582
             Project: CloudStack
          Issue Type: Bug
      Security Level: Public (Anyone can view this level - this is the default.)
          Components: Management Server
    Affects Versions: 4.2.0
            Reporter: Alena Prokharchyk
            Assignee: Kishan Kavala
             Fix For: 4.2.0


Commit 4ea36b82e9bb88e75f98982f8c302719f7520f2d was merged from 4.1 to master, and seems like
some merge conflicts were resolved the way causing inconsistencies between 4.1 and master
branches.

 AccountVO class, the constructor:

* in 4.1, UUID is passed to constructor in the list of arguments
* in master, it's being generated inside of the constructor.

Please make it consistent across branches, so we don't run into further conflicts later.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

Mime
View raw message