Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8FFBF187A1 for ; Thu, 28 Jan 2016 12:32:34 +0000 (UTC) Received: (qmail 69990 invoked by uid 500); 28 Jan 2016 12:32:34 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 69865 invoked by uid 500); 28 Jan 2016 12:32:34 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 69623 invoked by uid 99); 28 Jan 2016 12:32:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Jan 2016 12:32:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 08A2CE0BB6; Thu, 28 Jan 2016 12:32:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: remi@apache.org To: commits@cloudstack.apache.org Date: Thu, 28 Jan 2016 12:32:36 -0000 Message-Id: <99428b18fcde41228ec3d62b8fb328a6@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/4] git commit: updated refs/heads/4.8 to 69d1a5e Merge release branch 4.7 to 4.8 * 4.7: CLOUDSTACK-6181: Add 'root disk size' field in instance wizard for KVM templates Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/69d1a5e9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/69d1a5e9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/69d1a5e9 Branch: refs/heads/4.8 Commit: 69d1a5e9bc048e0faf1cdcde17bc4a9a67390b91 Parents: 48672c7 333957f Author: Remi Bergsma Authored: Thu Jan 28 13:32:08 2016 +0100 Committer: Remi Bergsma Committed: Thu Jan 28 13:32:08 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/69d1a5e9/client/WEB-INF/classes/resources/messages.properties ----------------------------------------------------------------------