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 BBAB519BAD for ; Thu, 21 Apr 2016 20:32:18 +0000 (UTC) Received: (qmail 52248 invoked by uid 500); 21 Apr 2016 20:32:18 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 52009 invoked by uid 500); 21 Apr 2016 20:32:18 -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 51724 invoked by uid 99); 21 Apr 2016 20:32:18 -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, 21 Apr 2016 20:32:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 949B2E03A9; Thu, 21 Apr 2016 20:32:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: swill@apache.org To: commits@cloudstack.apache.org Date: Thu, 21 Apr 2016 20:32:23 -0000 Message-Id: <72c99060cd3248fcb1f5a2c891c4e5c0@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [7/7] git commit: updated refs/heads/4.8 to c2fc0c4 Merge release branch 4.7 to 4.8 * 4.7: CLOUDSTACK-9172 Added cross zones check to delete template and iso Check the existence of 'forceencap' parameter before use systemvm: set default umask 022 in injectkeys.sh Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c2fc0c4c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c2fc0c4c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c2fc0c4c Branch: refs/heads/4.8 Commit: c2fc0c4cd3573ea6491ca9dd8b19d9c56c1a5ea0 Parents: 59ac07e d13ff88 Author: Will Stevens Authored: Thu Apr 21 16:31:49 2016 -0400 Committer: Will Stevens Committed: Thu Apr 21 16:31:49 2016 -0400 ---------------------------------------------------------------------- packaging/centos63/cloud-management.rc | 1 + packaging/centos7/cloud-management.service | 1 + scripts/vm/systemvm/injectkeys.sh | 2 +- .../debian/config/opt/cloud/bin/configure.py | 2 ++ ui/scripts/templates.js | 16 ++++++++++------ 5 files changed, 15 insertions(+), 7 deletions(-) ----------------------------------------------------------------------