You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2016/01/28 13:34:16 UTC

[2/5] git commit: updated refs/heads/master to e5f0788

Merge pull request #1342 from ustcweizhou/root-disk-size-ui

CLOUDSTACK-6181: Add 'root disk size' field in instance wizard for KVM templatesThis commit includes three changes:
(1) Revert commit 13bf1ec5da9891eca98ef5dab61bf74b6db9530b to show the 'root disk size' field
(2) Set the default value from '1' to empty. This also changes the default value of customized service offerings from '1' to empty.
(3) show 'root disk size' field only when users choose a KVM template, as cloudstack supports deployvm with rootdisksize on KVM only.

* pr/1342:
  CLOUDSTACK-6181: Add 'root disk size' field in instance wizard for KVM templates

Signed-off-by: Remi Bergsma <gi...@remi.nl>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a4ad71cc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a4ad71cc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a4ad71cc

Branch: refs/heads/master
Commit: a4ad71cc56d07d9314bb060f93846d75cace4e11
Parents: 451ae2b 3822be5
Author: Remi Bergsma <gi...@remi.nl>
Authored: Thu Jan 28 13:30:34 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Thu Jan 28 13:30:34 2016 +0100

----------------------------------------------------------------------
 .../classes/resources/messages.properties       |  2 +-
 ui/scripts/instanceWizard.js                    |  4 --
 ui/scripts/ui-custom/instanceWizard.js          | 55 ++++++++++++++++----
 3 files changed, 47 insertions(+), 14 deletions(-)
----------------------------------------------------------------------