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 008C42004A1 for ; Thu, 10 Aug 2017 01:05:52 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 60D9616A444; Wed, 9 Aug 2017 23:05:51 +0000 (UTC) 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 9A8E916A440 for ; Thu, 10 Aug 2017 01:05:50 +0200 (CEST) Received: (qmail 94341 invoked by uid 500); 9 Aug 2017 23:05:48 -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 94319 invoked by uid 99); 9 Aug 2017 23:05:48 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Aug 2017 23:05:48 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 177EA81224; Wed, 9 Aug 2017 23:05:48 +0000 (UTC) Date: Wed, 09 Aug 2017 23:05:48 +0000 To: "commits@cloudstack.apache.org" Subject: [cloudstack] 01/01: Merge branch '4.10' MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: bhaisaab@apache.org Reply-To: "commits@cloudstack.apache.org" In-Reply-To: <150231994763.19538.4148281515311177740@gitbox.apache.org> References: <150231994763.19538.4148281515311177740@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: cloudstack X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: d17728dd7e1948a3479d6191fac0ded88499482c X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20170809230548.177EA81224@gitbox.apache.org> archived-at: Wed, 09 Aug 2017 23:05:52 -0000 This is an automated email from the ASF dual-hosted git repository. bhaisaab pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit d17728dd7e1948a3479d6191fac0ded88499482c Merge: 18ffd7b cf6c949 Author: Rohit Yadav AuthorDate: Thu Aug 10 01:04:54 2017 +0200 Merge branch '4.10' ui/scripts/network.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --cc ui/scripts/network.js index 7f27373,72aa3ad..8370106 mode 100644,100755..100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js -- To stop receiving notification emails like this one, please contact "commits@cloudstack.apache.org" .