etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack

This commit is contained in:
olivier lamy 2012-08-29 00:09:13 +02:00
parent 5bb395ed0a 55c67092d0
commit 8643e2c9ac
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
View File

@ -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());

6
ui/scripts/ui/widgets/tagger.js
View File

@ -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) {