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

Posted to commits@cloudstack.apache.org by ro...@apache.org on 2020/07/07 07:23:36 UTC

[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.14'

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 2c82aac5aadcb891f3e7d110f629ffe934d7adf3
Merge: 7a41e27 b141b8e
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Tue Jul 7 12:53:05 2020 +0530

    Merge remote-tracking branch 'origin/4.14'

 .../cloud/deploy/DeploymentPlanningManager.java    |  3 ++
 .../main/java/com/cloud/user/dao/AccountDao.java   |  2 ++
 .../java/com/cloud/user/dao/AccountDaoImpl.java    | 12 +++++--
 .../cloudstack/quota/dao/QuotaAccountDao.java      |  3 ++
 .../cloudstack/quota/dao/QuotaAccountDaoImpl.java  | 14 ++++++--
 .../cloudstack/quota/dao/QuotaTariffDao.java       |  9 +++--
 .../cloudstack/quota/dao/QuotaTariffDaoImpl.java   | 39 +++++++++++++++-----
 .../cloudstack/api/command/QuotaSummaryCmd.java    |  9 ++---
 .../cloudstack/api/command/QuotaTariffListCmd.java |  7 ++--
 .../api/response/QuotaResponseBuilder.java         | 10 ++++--
 .../api/response/QuotaResponseBuilderImpl.java     | 42 +++++++++++++++-------
 .../api/response/QuotaSummaryResponse.java         | 12 +++----
 .../api/command/QuotaTariffListCmdTest.java        |  4 ++-
 .../deploy/DeploymentPlanningManagerImpl.java      |  6 ++--
 .../com/cloud/server/ManagementServerImpl.java     |  5 +++
 15 files changed, 128 insertions(+), 49 deletions(-)