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 A0EC2200CD3 for ; Fri, 28 Jul 2017 11:28:57 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9F58616C8C6; Fri, 28 Jul 2017 09:28:57 +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 168B916C8C5 for ; Fri, 28 Jul 2017 11:28:56 +0200 (CEST) Received: (qmail 4854 invoked by uid 500); 28 Jul 2017 09:28:51 -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 4838 invoked by uid 99); 28 Jul 2017 09:28:50 -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; Fri, 28 Jul 2017 09:28:50 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 25DE3849FB; Fri, 28 Jul 2017 09:28:48 +0000 (UTC) Date: Fri, 28 Jul 2017 09:28: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: <150123412779.29278.5481252517440660192@gitbox.apache.org> References: <150123412779.29278.5481252517440660192@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: 619da913860b01f461abe5c0c4e8ecd183d040fa X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20170728092849.25DE3849FB@gitbox.apache.org> archived-at: Fri, 28 Jul 2017 09:28:57 -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 619da913860b01f461abe5c0c4e8ecd183d040fa Merge: b83aa2a e9f526e Author: Rohit Yadav AuthorDate: Fri Jul 28 11:28:20 2017 +0200 Merge branch '4.10' agent/conf/agent.properties | 4 ++ .../affinitygroup/UpdateVMAffinityGroupCmd.java | 12 +++-- .../virtualnetwork/VirtualRoutingResource.java | 9 ++-- .../network/guru/NuageVspGuestNetworkGuru.java | 36 +++++++------- .../src/com/cloud/util/NuageVspEntityBuilder.java | 56 +++++++++++++++------- .../com/cloud/util/NuageVspEntityBuilderTest.java | 33 ++++++------- server/src/com/cloud/server/StatsCollector.java | 4 +- systemvm/patches/debian/config/etc/vpcdnsmasq.conf | 2 +- test/integration/component/test_affinity_groups.py | 27 ++++++++++- 9 files changed, 121 insertions(+), 62 deletions(-) -- To stop receiving notification emails like this one, please contact "commits@cloudstack.apache.org" .