You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2013/11/07 22:29:11 UTC

git commit: updated refs/heads/4.2 to f1568f9

Updated Branches:
  refs/heads/4.2 527f03722 -> f1568f953


CLOUDSTACK-4058: UI > Host detail page > (1) Add Hypervisor, HypervisorVersion field.
(2) Remove CloudstackVersion field.


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

Branch: refs/heads/4.2
Commit: f1568f953ce2554691ff7966417841fac43c7d47
Parents: 527f037
Author: Jessica Wang <je...@apache.org>
Authored: Thu Nov 7 13:28:48 2013 -0800
Committer: Jessica Wang <je...@apache.org>
Committed: Thu Nov 7 13:29:01 2013 -0800

----------------------------------------------------------------------
 ui/scripts/system.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f1568f95/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 4b70636..eeec0e0 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -12301,6 +12301,12 @@
                                         },
                                         type: {
                                             label: 'label.type'
+                                        },                                                                                
+                                        hypervisor: {
+                                        	label: 'label.hypervisor'
+                                        },
+                                        hypervisorversion: {
+                                        	label: 'label.hypervisor.version'
                                         },
                                         hosttags: {
                                             label: 'label.host.tags',
@@ -12348,10 +12354,7 @@
                                         },
                                         ipaddress: {
                                             label: 'label.ip.address'
-                                        },
-                                        version: {
-                                            label: 'label.version'
-                                        },
+                                        },                                        
                                         disconnected: {
                                             label: 'label.last.disconnected'
                                         }