GitHub user karuturi opened a pull request:
https://github.com/apache/cloudstack/pull/1977
fixed the merge conflict on merging #1941
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/Accelerite/cloudstack build-fix
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/cloudstack/pull/1977.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 #1977
----
commit 8402ee635c089a07230cfbe7f971451f959d46ba
Author: Rajani Karuturi <[email protected]>
Date: 2017-02-28T07:03:47Z
fixed an issue due to the merge conflict on merging #1941
----
---
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.
---
