Merge release branch 4.7 to master * 4.7: CLOUDSTACK-9237: Create LB Healthcheck issues - button alignment and error message goes outside the window CLOUDSTACK-9235: Autoscale button is missing in VPC CLOUDSTACK-9229: Autoscale policy creation failing in VPC due to zoneid missing in createAutoScaleVmProfile
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ce4ea45c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ce4ea45c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ce4ea45c Branch: refs/heads/master Commit: ce4ea45ce04b3d4b82dd1351d12457c836d452dd Parents: 0403a35 8361595 Author: Remi Bergsma <[email protected]> Authored: Wed Jan 20 22:39:37 2016 +0100 Committer: Remi Bergsma <[email protected]> Committed: Wed Jan 20 22:39:37 2016 +0100 ---------------------------------------------------------------------- .../lb/LoadBalancingRulesManagerImpl.java | 2 +- ui/scripts/autoscaler.js | 2 +- ui/scripts/network.js | 29 ++++++++------------ ui/scripts/ui-custom/autoscaler.js | 2 +- ui/scripts/ui-custom/healthCheck.js | 12 ++++---- 5 files changed, 20 insertions(+), 27 deletions(-) ----------------------------------------------------------------------
