You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cloudstack.apache.org by ra...@apache.org on 2017/06/06 10:05:15 UTC

[cloudstack] 01/01: Merge pull request #1996 from Accelerite/secretkey

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 <ka...@users.noreply.github.com>
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" <co...@cloudstack.apache.org>.