Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id AF7DE200ACC for ; Mon, 2 May 2016 16:36:25 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id AE54E1609B6; Mon, 2 May 2016 16:36:25 +0200 (CEST) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id EF96B1609B0 for ; Mon, 2 May 2016 16:36:24 +0200 (CEST) Received: (qmail 37678 invoked by uid 500); 2 May 2016 14:36:23 -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 37418 invoked by uid 99); 2 May 2016 14:36:23 -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; Mon, 02 May 2016 14:36:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 07E0ADFBDE; Mon, 2 May 2016 14:36:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dahn@apache.org To: commits@cloudstack.apache.org Date: Mon, 02 May 2016 14:36:25 -0000 Message-Id: <1e4fb1b52fc44b818badce299727802d@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [04/44] git commit: updated refs/heads/4.9-bountycastle-daan to a001d75 archived-at: Mon, 02 May 2016 14:36:25 -0000 Merge pull request #4 from apache/4.7 4.7 PR Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/48ce7634 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/48ce7634 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/48ce7634 Branch: refs/heads/4.9-bountycastle-daan Commit: 48ce76344040de2ab8014f76292abe0421d42f85 Parents: a243339 4db1c01 Author: Simon Weller Authored: Thu Mar 24 14:55:34 2016 -0500 Committer: Simon Weller Committed: Thu Mar 24 14:55:34 2016 -0500 ---------------------------------------------------------------------- agent/src/com/cloud/agent/Agent.java | 6 +++--- ui/scripts/network.js | 8 ++++---- ui/scripts/ui-custom/instanceWizard.js | 2 +- ui/scripts/ui-custom/projects.js | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) ----------------------------------------------------------------------