You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by rhtyd <gi...@git.apache.org> on 2016/11/27 10:15:42 UTC

[GitHub] cloudstack pull request #1788: systemvm: Fix regression from fwd-merging PR ...

GitHub user rhtyd opened a pull request:

    https://github.com/apache/cloudstack/pull/1788

    systemvm: Fix regression from fwd-merging PR #1766

    Fixes merge conflict issue incorrectly fixed during a fwd-merge in 825935
    from PR #1766.

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/shapeblue/cloudstack 4.9-fix-merge-pr1766

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/cloudstack/pull/1788.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #1788
    
----
commit cc72e4da64e28ecf948246684233bbe8cfa46ab6
Author: Rohit Yadav <ro...@shapeblue.com>
Date:   2016-11-27T10:13:10Z

    systemvm: Fix regression from 825935
    
    Fixes merge conflict issue incorrectly fixed during a fwd-merge in 825935
    from PR #1766
    
    Signed-off-by: Rohit Yadav <ro...@shapeblue.com>

----


---
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.
---

[GitHub] cloudstack issue #1788: systemvm: Fix regression from fwd-merging PR #1766

Posted by rhtyd <gi...@git.apache.org>.
Github user rhtyd commented on the issue:

    https://github.com/apache/cloudstack/pull/1788
  
    Notes: centos6 build failed due to an intermittent unit test that fails sometimes when clocks are skewed: `  HypervisorUtilsTest.checkVolumeFileForActivityTest:68 Didn't block long enough, expected at least 2000 and got 1061`



---
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.
---

[GitHub] cloudstack issue #1788: systemvm: Fix regression from fwd-merging PR #1766

Posted by rhtyd <gi...@git.apache.org>.
Github user rhtyd commented on the issue:

    https://github.com/apache/cloudstack/pull/1788
  
    @blueorangutan package


---
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.
---

[GitHub] cloudstack issue #1788: systemvm: Fix regression from fwd-merging PR #1766

Posted by blueorangutan <gi...@git.apache.org>.
Github user blueorangutan commented on the issue:

    https://github.com/apache/cloudstack/pull/1788
  
    Packaging result: \u2716centos6 \u2714centos7 \u2714debian. JID-259


---
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.
---

[GitHub] cloudstack issue #1788: systemvm: Fix regression from fwd-merging PR #1766

Posted by rhtyd <gi...@git.apache.org>.
Github user rhtyd commented on the issue:

    https://github.com/apache/cloudstack/pull/1788
  
    Merging this based on internal tests, the issue was tuple did not include `lease`. Merging this now.


---
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.
---

[GitHub] cloudstack pull request #1788: systemvm: Fix regression from fwd-merging PR ...

Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:

    https://github.com/apache/cloudstack/pull/1788


---
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.
---

[GitHub] cloudstack issue #1788: systemvm: Fix regression from fwd-merging PR #1766

Posted by blueorangutan <gi...@git.apache.org>.
Github user blueorangutan commented on the issue:

    https://github.com/apache/cloudstack/pull/1788
  
    @rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.


---
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.
---