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 <[email protected]>
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 <[email protected]>
----
---
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 [email protected] or file a JIRA ticket
with INFRA.
---
