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 E40AE2004F1 for ; Thu, 10 Aug 2017 01:59:47 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E0FB816A570; Wed, 9 Aug 2017 23:59:47 +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 6179416A572 for ; Thu, 10 Aug 2017 01:59:47 +0200 (CEST) Received: (qmail 92460 invoked by uid 500); 9 Aug 2017 23:59:46 -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 92433 invoked by uid 99); 9 Aug 2017 23:59:46 -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:59:46 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 04D968122C; Wed, 9 Aug 2017 23:59:46 +0000 (UTC) Date: Wed, 09 Aug 2017 23:59:46 +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: <150232318554.5102.16971075260701591951@gitbox.apache.org> References: <150232318554.5102.16971075260701591951@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: f84728d374355590af7954be3b874fedc8ff080e X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20170809235946.04D968122C@gitbox.apache.org> archived-at: Wed, 09 Aug 2017 23:59:48 -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 f84728d374355590af7954be3b874fedc8ff080e Merge: 92b07d4 d9b7b8c Author: Rohit Yadav AuthorDate: Thu Aug 10 01:59:34 2017 +0200 Merge branch '4.10' .../cloud/configuration/ConfigurationManager.java | 14 +++ engine/schema/src/com/cloud/domain/DomainVO.java | 8 ++ .../configuration/ConfigurationManagerImpl.java | 40 ++++++-- server/src/com/cloud/user/DomainManagerImpl.java | 16 ++- .../test/com/cloud/user/DomainManagerImplTest.java | 107 +++++++++++++++++---- .../cloud/vpc/MockConfigurationManagerImpl.java | 11 ++- 6 files changed, 166 insertions(+), 30 deletions(-) -- To stop receiving notification emails like this one, please contact "commits@cloudstack.apache.org" .