Repository: cloudstack
Updated Branches:
  refs/heads/master e8486dfca -> 3d34a136a


CLOUDSTACK-6168: fixed the description for global config "vm.instancename.flag" 
- the flag is applicable for VMware hypervisor only


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3d34a136
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3d34a136
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3d34a136

Branch: refs/heads/master
Commit: 3d34a136a6b7d0a36838069d2fe29d59e1df9798
Parents: e8486df
Author: Alena Prokharchyk <[email protected]>
Authored: Tue Jul 29 11:15:24 2014 -0700
Committer: Alena Prokharchyk <[email protected]>
Committed: Tue Jul 29 11:15:37 2014 -0700

----------------------------------------------------------------------
 server/src/com/cloud/configuration/Config.java | 2 +-
 setup/db/db/schema-441to450.sql                | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d34a136/server/src/com/cloud/configuration/Config.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/Config.java 
b/server/src/com/cloud/configuration/Config.java
index fbcb1f4..1fa3164 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -1062,7 +1062,7 @@ public enum Config {
             Boolean.class,
             "vm.instancename.flag",
             "false",
-            "If set to true, will set guest VM's name as it appears on the 
hypervisor, to its hostname",
+            "If set to true, will set guest VM's name as it appears on the 
hypervisor, to its hostname. The flag is supported for VMware hypervisor only",
             "true,false"),
     IncorrectLoginAttemptsAllowed(
             "Advanced",

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d34a136/setup/db/db/schema-441to450.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-441to450.sql b/setup/db/db/schema-441to450.sql
index b8a829a..3f78c1f 100644
--- a/setup/db/db/schema-441to450.sql
+++ b/setup/db/db/schema-441to450.sql
@@ -429,3 +429,6 @@ CREATE VIEW `cloud`.`template_view` AS
         `cloud`.`resource_tags` ON resource_tags.resource_id = vm_template.id
             and (resource_tags.resource_type = 'Template' or 
resource_tags.resource_type='ISO');
 
+
+
+UPDATE `cloud`.`configuration` SET description="If set to true, will set guest 
VM's name as it appears on the hypervisor, to its hostname. The flag is 
supported for VMware hypervisor only" WHERE name='vm.instancename.flag';

Reply via email to