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 239DF200AE2 for ; Fri, 27 May 2016 21:04:12 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 22340160A10; Fri, 27 May 2016 19:04:12 +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 6C3BE160A38 for ; Fri, 27 May 2016 21:04:11 +0200 (CEST) Received: (qmail 59388 invoked by uid 500); 27 May 2016 19:04:10 -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 58741 invoked by uid 99); 27 May 2016 19:04:09 -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; Fri, 27 May 2016 19:04:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BCC98E943A; Fri, 27 May 2016 19:04:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: swill@apache.org To: commits@cloudstack.apache.org Date: Fri, 27 May 2016 19:04:15 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [7/7] git commit: updated refs/heads/4.8 to 744f9d5 archived-at: Fri, 27 May 2016 19:04:12 -0000 Merge release branch 4.7 to 4.8 * 4.7: CLOUDSTACK-9376: Restrict listTemplates API with filter=all for root admin CLOUDSTACK-9369: Restrict default login to ldap/native users Add lsb-release dependency to mgmt server and agent on Debian/Ubuntu. Emit template UUID and class type over event bus when deleting templates. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/744f9d56 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/744f9d56 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/744f9d56 Branch: refs/heads/4.8 Commit: 744f9d56156455b428f567d634d3c5ae9fe6a94f Parents: 7974bfd 9275ba2 Author: Will Stevens Authored: Fri May 27 15:03:42 2016 -0400 Committer: Will Stevens Committed: Fri May 27 15:03:42 2016 -0400 ---------------------------------------------------------------------- api/src/com/cloud/user/DomainService.java | 10 + debian/control | 4 +- server/src/com/cloud/api/ApiServer.java | 16 +- .../auth/DefaultLoginAPIAuthenticatorCmd.java | 13 + .../com/cloud/api/query/QueryManagerImpl.java | 4 +- .../template/HypervisorTemplateAdapter.java | 2 +- .../src/com/cloud/user/DomainManagerImpl.java | 20 ++ .../template/HypervisorTemplateAdapterTest.java | 285 +++++++++++++++++++ .../com/cloud/user/DomainManagerImplTest.java | 137 +++++++++ .../com/cloud/user/MockDomainManagerImpl.java | 5 + test/integration/component/test_templates.py | 76 +++++ test/integration/smoke/test_login.py | 145 ++++++++++ 12 files changed, 701 insertions(+), 16 deletions(-) ----------------------------------------------------------------------