diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java index d8f90adfe39..8378eec005f 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java @@ -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 indexList = new ArrayList(); 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); diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStorageVolumeDef.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStorageVolumeDef.java index 7f9ceebe742..92f6e3958c1 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStorageVolumeDef.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStorageVolumeDef.java @@ -73,7 +73,7 @@ public class LibvirtStorageVolumeDef { storageVolBuilder.append("" + _volName + "\n"); if (_volSize != null) { storageVolBuilder - .append("" + _volSize + "\n"); + .append("" + _volSize + "\n"); } storageVolBuilder.append("\n"); storageVolBuilder.append("\n"); diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 9e60cbcc20f..61468fcd05f 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -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'}, diff --git a/ui/scripts/ui-custom/projectSelect.js b/ui/scripts/ui-custom/projectSelect.js index 82d02c174b7..aef49ed23e5 100644 --- a/ui/scripts/ui-custom/projectSelect.js +++ b/ui/scripts/ui-custom/projectSelect.js @@ -32,9 +32,9 @@ var projects = args.data; $(projects).map(function(index, project) { - var $option = $('