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/cloudstack into disk_io_throttling

This commit is contained in:
Wei Zhou 2013-06-10 23:12:45 +02:00
parent 02e5cb3e93 ecbce6a67f
commit 8da34d2964
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
View File

@ -90,6 +90,7 @@ public class Upgrade410to420 implements DbUpgrade {
//First drop if it exists. (Due to patches shipped to customers some will have the index and some wont.)
List<String> indexList = new ArrayList<String>();
s_logger.debug("Dropping index i_alert__last_sent if it exists");
indexList.add("last_sent"); // in 4.1, we created this index that is not in convention.
indexList.add("i_alert__last_sent");
DbUpgradeUtils.dropKeysIfExist(conn, "alert", indexList, false);

2
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStorageVolumeDef.java
View File

@ -73,7 +73,7 @@ public class LibvirtStorageVolumeDef {
storageVolBuilder.append("<name>" + _volName + "</name>\n");
if (_volSize != null) {
storageVolBuilder
.append("<capacity >" + _volSize + "</capacity>\n");
.append("<capacity>" + _volSize + "</capacity>\n");
}
storageVolBuilder.append("<target>\n");
storageVolBuilder.append("<format type='" + _volFormat + "'/>\n");

7
ui/scripts/network.js
View File

@ -320,8 +320,8 @@
title: 'label.guest.networks',
listView: {
actions: {
add: { //add Isolated guest network (can't add Shared guest network here)
label: 'Add Isolated Guest Network',
add: {
label: 'Add Isolated Guest Network with SourceNat',
preFilter: function(args) { //Isolated networks is only supported in Advanced (SG-disabled) zone
if(args.context.zoneType != 'Basic')
@ -331,8 +331,7 @@
},
createForm: {
title: 'Add Isolated Guest Network',
desc: 'Add Isolated Guest Network with SourceNat',
title: 'Add Isolated Guest Network with SourceNat',
fields: {
name: { label: 'label.name', validation: { required: true }, docID: 'helpGuestNetworkName' },
displayText: { label: 'label.display.text', validation: { required: true }, docID: 'helpGuestNetworkDisplayText'},

4
ui/scripts/ui-custom/projectSelect.js
View File

@ -32,9 +32,9 @@
var projects = args.data;
$(projects).map(function(index, project) {
var $option = $('<option>').val(project.id);
var $option = $('<option>').val(_s(project.id));
$option.html(project.displaytext ? project.displaytext : project.name);
$option.html(_s(project.displaytext ? project.displaytext : project.name));
$option.appendTo($projectSelect);
});
},

4
ui/scripts/ui-custom/projects.js
View File

@ -304,14 +304,14 @@
var $formDesc = $('<div>').addClass('form-desc');
var $projectName = $('<div>').addClass('field name')
.append($('<label>').attr('for', 'project-name').html(_l('label.project.name')))
.append($('<input>').addClass('required').attr({
.append($('<input>').addClass('required disallowSpecialCharacters').attr({
type: 'text',
name: 'project-name',
id: 'project-name'
}));
var $projectDesc = $('<div>').addClass('field desc')
.append($('<label>').attr('for', 'project-desc').html(_l('label.display.text')))
.append($('<input>').attr({
.append($('<input>').addClass('disallowSpecialCharacters').attr({
type: 'text',
name: 'project-display-text',
id: 'project-desc'

2
ui/scripts/ui/utils.js
View File

@ -23,7 +23,7 @@
$($form.serializeArray()).each(function() {
var dataItem = data[this.name];
var value = this.value.toString();
var value = _s(this.value.toString());
if (options.escapeSlashes) {
value = value.replace(/\//g, '__forwardSlash__');