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 2014/09/03 20:39:11 UTC
git commit: updated refs/heads/master to 5e55b6b
Repository: cloudstack
Updated Branches:
refs/heads/master 672bb353b -> 5e55b6b47
CLOUDSTACK-7480: UI > instance page > change "XenServer Tools Version 6.1+ field" to "Original XS Version is 6.1+" because what the field really presents is the original XenServer version when a VM is initially created.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5e55b6b4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5e55b6b4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5e55b6b4
Branch: refs/heads/master
Commit: 5e55b6b478c9a919976e399eb9bf85cfd91c118b
Parents: 672bb35
Author: Jessica Wang <je...@apache.org>
Authored: Wed Sep 3 11:37:24 2014 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Wed Sep 3 11:37:34 2014 -0700
----------------------------------------------------------------------
client/WEB-INF/classes/resources/messages.properties | 6 +++---
ui/scripts/instances.js | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5e55b6b4/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 65a44a6..4655973 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -1298,7 +1298,7 @@ label.openDaylight=OpenDaylight
label.assign.instance.another=Assign Instance to Another Account
label.network.addVM=Add network to VM
label.set.default.NIC=Set default NIC
-label.Xenserver.Tools.Version61plus=XenServer Tools Version 6.1\+
+label.Xenserver.Tools.Version61plus=Original XS Version is 6.1\+
label.supportsstrechedl2subnet=Supports Streched L2 Subnet
label.menu.vpc.offerings=VPC Offerings
label.vpc.offering=VPC Offering
@@ -1516,7 +1516,7 @@ label.virtual.networking=Virtual Networking
label.allow=Allow
label.deny=Deny
label.default.egress.policy=Default egress policy
-label.xenserver.tools.version.61.plus=XenServer Tools Version 6.1\+
+label.xenserver.tools.version.61.plus=Original XS Version is 6.1\+
label.gpu=GPU
label.vgpu.type=vGPU type
label.vgpu.video.ram=Video RAM
@@ -1866,7 +1866,7 @@ message.set.default.NIC.manual=Please manually update the default NIC on the VM
message.instance.scaled.up.confirm=Do you really want to scale Up your instance ?
message.copy.template.confirm=Are you sure you want to copy template?
message.template.copying=Template is being copied.
-message.XSTools61plus.update.failed=Failed to update XenServer Tools Version 6.1\+ field. Error\:
+message.XSTools61plus.update.failed=Failed to update Original XS Version is 6.1\+ field. Error\:
message.gslb.delete.confirm=Please confirm you want to delete this GSLB
message.portable.ip.delete.confirm=Please confirm you want to delete Portable IP Range
message.gslb.lb.remove.confirm=Please confirm you want to remove load balancing from GSLB
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5e55b6b4/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index d3eb2a4..7205999 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -936,14 +936,14 @@
//do nothing
} else if (result.jobstatus == 2) {
cloudStack.dialog.notice({
- message: "Failed to update XenServer Tools Version 6.1+ field. Error: " + _s(result.jobresult.errortext)
+ message: _s(result.jobresult.errortext)
});
}
}
},
error: function(XMLHttpResponse) {
cloudStack.dialog.notice({
- message: "Failed to update XenServer Tools Version 6.1+ field. Error: " + parseXMLHttpResponse(XMLHttpResponse)
+ message: parseXMLHttpResponse(XMLHttpResponse)
});
}
});