You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2013/07/20 01:47:18 UTC
git commit: updated refs/heads/master to 24fc147
Updated Branches:
refs/heads/master 0633608f8 -> 24fc147ee
System Template shows twice in listTemplates with S3 as secondary
storage.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/24fc147e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/24fc147e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/24fc147e
Branch: refs/heads/master
Commit: 24fc147ee87306c35ca90d1c5dde391ddf2fc0a8
Parents: 0633608
Author: Min Chen <mi...@citrix.com>
Authored: Fri Jul 19 16:43:44 2013 -0700
Committer: Min Chen <mi...@citrix.com>
Committed: Fri Jul 19 16:47:08 2013 -0700
----------------------------------------------------------------------
setup/db/db/schema-410to420.sql | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/24fc147e/setup/db/db/schema-410to420.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index 596723c..dd8c75a 100644
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -1964,7 +1964,7 @@ CREATE VIEW `cloud`.`template_view` AS
left join
`cloud`.`vm_template` source_template ON source_template.id = vm_template.source_template_id
left join
- `cloud`.`template_store_ref` ON template_store_ref.template_id = vm_template.id
+ `cloud`.`template_store_ref` ON template_store_ref.template_id = vm_template.id and template_store_ref.store_role = 'Image'
left join
`cloud`.`image_store` ON image_store.removed is NULL AND template_store_ref.store_id is not NULL AND image_store.id = template_store_ref.store_id
left join