Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss

This commit is contained in:
Jessica Wang 2010-10-27 20:00:26 -07:00
commit 49e6cd876a
1 changed files with 1 additions and 0 deletions

View File

@ -180,6 +180,7 @@ public class ListTemplatesCmd extends BaseListCmd {
if (template.getTemplateType() != null) {
templateResponse.setTemplateType(template.getTemplateType().toString());
}
templateResponse.setHypervisor(template.getHypervisorType().toString());
GuestOS os = ApiDBUtils.findGuestOSById(template.getGuestOSId());
if (os != null) {