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 B456A200CCF for ; Mon, 24 Jul 2017 12:44:46 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B2DDE164DE4; Mon, 24 Jul 2017 10:44:46 +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 30051164DDA for ; Mon, 24 Jul 2017 12:44:46 +0200 (CEST) Received: (qmail 95562 invoked by uid 500); 24 Jul 2017 10:44:45 -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 95553 invoked by uid 99); 24 Jul 2017 10:44:45 -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; Mon, 24 Jul 2017 10:44:45 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 9DD86811A4; Mon, 24 Jul 2017 10:44:43 +0000 (UTC) Date: Mon, 24 Jul 2017 10:44:44 +0000 To: "commits@cloudstack.apache.org" Subject: [cloudstack] 02/02: 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: <150089308240.8456.9318976455336779380@gitbox.apache.org> References: <150089308240.8456.9318976455336779380@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: c384239a058fc658081ac7334465b65704028b9a X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20170724104443.9DD86811A4@gitbox.apache.org> archived-at: Mon, 24 Jul 2017 10:44:46 -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 c384239a058fc658081ac7334465b65704028b9a Merge: bef5c17 83e9de4 Author: Rohit Yadav AuthorDate: Mon Jul 24 12:44:25 2017 +0200 Merge branch '4.10' .../cloudstack/metrics/MetricsServiceImpl.java | 11 ++++------ .../response/ClusterMetricsResponse.java | 24 +++++++++++----------- .../cloudstack/response/HostMetricsResponse.java | 8 ++++---- .../org/apache/cloudstack/acl/RoleManagerImpl.java | 8 +++++++- 4 files changed, 27 insertions(+), 24 deletions(-) -- To stop receiving notification emails like this one, please contact "commits@cloudstack.apache.org" .