You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by gi...@apache.org on 2014/01/29 09:53:40 UTC
[05/50] git commit: updated refs/heads/marvin to df58f51
Fix trailing whitespace from cherry-pick
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f77974b5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f77974b5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f77974b5
Branch: refs/heads/marvin
Commit: f77974b5d2e8c2164327da9f7cc744a38f8959a9
Parents: cfe7864
Author: Min Chen <mi...@citrix.com>
Authored: Mon Jan 27 13:31:13 2014 -0800
Committer: Min Chen <mi...@citrix.com>
Committed: Mon Jan 27 13:31:35 2014 -0800
----------------------------------------------------------------------
server/src/com/cloud/template/TemplateAdapterBase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f77974b5/server/src/com/cloud/template/TemplateAdapterBase.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/template/TemplateAdapterBase.java b/server/src/com/cloud/template/TemplateAdapterBase.java
index 0ac434c..e399912 100755
--- a/server/src/com/cloud/template/TemplateAdapterBase.java
+++ b/server/src/com/cloud/template/TemplateAdapterBase.java
@@ -181,7 +181,7 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat
if (stores != null && stores.size() > 0) {
isRegionStore = true;
}
-
+
if (!isAdmin && zoneId == null && !isRegionStore ) {
// domain admin and user should also be able to register template on a region store
throw new InvalidParameterValueException("Please specify a valid zone Id.");