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

server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java

@@ -77,7 +77,7 @@ public class HostJoinDaoImpl extends GenericDaoBase<HostJoinVO, Long> implements
         hostResponse.setCapabilities(host.getCapabilities());
         hostResponse.setClusterId(host.getClusterUuid());
         hostResponse.setCpuNumber(host.getCpus());
-        hostResponse.setZoneId(host.getUuid());
+        hostResponse.setZoneId(host.getZoneUuid());
         hostResponse.setDisconnectedOn(host.getDisconnectedOn());
         hostResponse.setHypervisor(host.getHypervisorType());
         hostResponse.setHostType(host.getType());

setup/db/create-schema.sql

@@ -1332,6 +1332,7 @@ CREATE TABLE `cloud`.`alert` (
   `last_sent` DATETIME NULL COMMENT 'Last time the alert was sent',
   `resolved` DATETIME NULL COMMENT 'when the alert status was resolved (available memory no longer at critical level, etc.)',
   PRIMARY KEY  (`id`),
+  INDEX `last_sent` (`last_sent` DESC),
   CONSTRAINT `uc_alert__uuid` UNIQUE (`uuid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 

setup/db/db/schema-40to410.sql

@@ -77,6 +77,8 @@ ALTER TABLE `cloud`.`inline_load_balancer_nic_map` DROP COLUMN load_balancer_id;
 ALTER TABLE upload ADD uuid VARCHAR(40);
 ALTER TABLE async_job modify job_cmd VARCHAR(255);
 
+ALTER TABLE `cloud`.`alert` ADD INDEX `last_sent` (`last_sent` DESC) ;
+
 -- populate uuid column with db id if uuid is null
 UPDATE `cloud`.`account` set uuid=id WHERE uuid is NULL;
 UPDATE `cloud`.`alert` set uuid=id WHERE uuid is NULL;

ui/scripts/ui-custom/instanceWizard.js

@@ -860,8 +860,19 @@
 
           // Previous button
           if ($target.closest('div.button.previous').size()) {
-            var index = $steps.filter(':visible').index();
-            if (index) showStep(index);
+            var $step = $steps.filter(':visible');
+            var $networkStep = $steps.filter('.network');
+            var index = $step.index();
+
+            $networkStep.removeClass('next-use-security-groups');
+
+            if (index) {
+              if (index == $steps.size() - 1 && $networkStep.hasClass('next-use-security-groups')) {
+                showStep(5);
+              } else {
+                showStep(index);
+              }
+            }
 
             return false;
           }