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 2C5E8200C8C for ; Tue, 6 Jun 2017 12:05:18 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2B2AF160BC3; Tue, 6 Jun 2017 10:05:18 +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 72374160BC6 for ; Tue, 6 Jun 2017 12:05:17 +0200 (CEST) Received: (qmail 46410 invoked by uid 500); 6 Jun 2017 10:05:16 -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 46401 invoked by uid 99); 6 Jun 2017 10:05:16 -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; Tue, 06 Jun 2017 10:05:16 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 42A068148E; Tue, 6 Jun 2017 10:05:14 +0000 (UTC) Date: Tue, 06 Jun 2017 10:05:15 +0000 To: "commits@cloudstack.apache.org" Subject: [cloudstack] 01/01: Merge pull request #1996 from Accelerite/secretkey MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: rajani@apache.org Reply-To: "commits@cloudstack.apache.org" In-Reply-To: <149674351428.15252.6460729821028464153@gitbox.apache.org> References: <149674351428.15252.6460729821028464153@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: 68d50fbfd86dae20ff1b78e7a054b0fdee2605d7 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20170606100515.42A068148E@gitbox.apache.org> archived-at: Tue, 06 Jun 2017 10:05:18 -0000 This is an automated email from the ASF dual-hosted git repository. rajani pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit 68d50fbfd86dae20ff1b78e7a054b0fdee2605d7 Merge: c3d6b9e 87cf33a Author: Rajani Karuturi AuthorDate: Tue Jun 6 15:35:11 2017 +0530 Merge pull request #1996 from Accelerite/secretkey CLOUDSTACK-9099: SecretKey is returned from the APIs api/src/com/cloud/user/AccountService.java | 5 + .../api/command/admin/user/GetUserKeysCmd.java | 77 +++++++++++ .../cloudstack/api/response/UserResponse.java | 2 +- .../contrail/management/MockAccountManager.java | 22 ++++ server/src/com/cloud/api/ApiDBUtils.java | 4 + .../src/com/cloud/server/ManagementServerImpl.java | 2 + server/src/com/cloud/user/AccountManager.java | 11 +- server/src/com/cloud/user/AccountManagerImpl.java | 141 ++++++++++++++------- .../com/cloud/user/AccountManagerImplTest.java | 38 ++++++ .../com/cloud/user/MockAccountManagerImpl.java | 21 +++ tools/marvin/marvin/cloudstackTestClient.py | 40 +++++- ui/scripts/accounts.js | 33 +++-- 12 files changed, 330 insertions(+), 66 deletions(-) -- To stop receiving notification emails like this one, please contact "commits@cloudstack.apache.org" .