[
https://issues.apache.org/jira/browse/CLOUDSTACK-9103?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15055690#comment-15055690
]
ASF GitHub Bot commented on CLOUDSTACK-9103:
--------------------------------------------
Github user DaanHoogland commented on the pull request:
https://github.com/apache/cloudstack/pull/1216#issuecomment-164387475
@maneesha-p @remibergsma had a go at it just before the creation of the RC
yesterday nigt but he encountered merge conflicts. Can you have e look? merge
with
```$ git pr 1216``` to see what the conflicts are. for this you need to
have ```git-pr``` in ```tools/git``` in your ```PATH```. alternatively you can
just try to checkout ```master``` and ```$ git merge <your branch>```.
> Missing OS Mappings for VMware 6.0
> ----------------------------------
>
> Key: CLOUDSTACK-9103
> URL: https://issues.apache.org/jira/browse/CLOUDSTACK-9103
> Project: CloudStack
> Issue Type: Bug
> Security Level: Public(Anyone can view this level - this is the
> default.)
> Reporter: Maneesha
>
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
