From 155436870fda32bcba76bf4d8a532d4821da78be Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica.wang@citrix.com>
Date: Tue, 28 Aug 2012 14:42:16 -0700
Subject: [PATCH 1/2] cloudstack 3.0 UI - tagger widget - localize text
 (Reviewed-by: Brian)

---
 ui/scripts/ui/widgets/tagger.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/scripts/ui/widgets/tagger.js b/ui/scripts/ui/widgets/tagger.js
index 1b9c9289ad3..53dd51566a2 100644
--- a/ui/scripts/ui/widgets/tagger.js
+++ b/ui/scripts/ui/widgets/tagger.js
@@ -33,10 +33,10 @@
     inputArea: function(args) {
       var $form = $('<form>').addClass('tag-input');
       var $keyField = $('<div>').addClass('field key');
-      var $keyLabel = $('<label>').attr('for', 'key').html('Key:');
+      var $keyLabel = $('<label>').attr('for', 'key').html(_l('label.key') + ':');
       var $key = $('<input>').addClass('key').attr('name', 'key');
       var $valueField = $('<div>').addClass('field value');
-      var $valueLabel = $('<label>').attr('for', 'value').html('Value:');
+      var $valueLabel = $('<label>').attr('for', 'value').html(_l('label.value') + ':');
       var $value = $('<input>').addClass('value').attr('name', 'value');
       var $submit = $('<input>').attr('type', 'submit').val('Add');
 
@@ -117,7 +117,7 @@
       var actions = this.options.actions;
       var $container = this.element.addClass('tagger');
       var $tagArea = $('<ul>').addClass('tags');
-      var $title = elems.info('Tags').addClass('title');
+      var $title = elems.info(_l('label.tags')).addClass('title');
       var $loading = $('<div>').addClass('loading-overlay');
 
       var onRemoveItem = function($item, data) {

From 55c67092d0bbd8116b21efd088f7960ecc1256b4 Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven.yang@citrix.com>
Date: Tue, 28 Aug 2012 14:50:02 -0700
Subject: [PATCH 2/2] Commit for https://reviews.apache.org/r/6547/

---
 .../com/cloud/hypervisor/vmware/resource/VmwareResource.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 2b7b485c639..2686c2d1bee 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -1344,11 +1344,11 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
         args += vlanGateway;
 
         if (s_logger.isDebugEnabled()) {
-            s_logger.debug("Run command on domain router " + privateIpAddress + ", /root/ipassoc.sh " + args);
+            s_logger.debug("Run command on domain router " + privateIpAddress + ", /opt/cloud/bin/ipassoc.sh " + args);
         }
 
         VmwareManager mgr = getServiceContext().getStockObject(VmwareManager.CONTEXT_STOCK_NAME);
-        Pair<Boolean, String> result = SshHelper.sshExecute(privateIpAddress, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/root/ipassoc.sh " + args);
+        Pair<Boolean, String> result = SshHelper.sshExecute(privateIpAddress, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/ipassoc.sh " + args);
 
         if (!result.first()) {
             s_logger.error("ipassoc command on domain router " + privateIpAddress + " failed. message: " + result.second());