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 2021/02/05 10:33:09 UTC

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

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 ba127dab3e2ebda5994a4d2982d718e14be91d76
Merge: ff376d8 6bde138
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Fri Feb 5 16:02:26 2021 +0530

    Merge remote-tracking branch 'origin/4.15'
    
    Signed-off-by: Rohit Yadav <ro...@shapeblue.com>

 .../java/com/cloud/capacity/CapacityManager.java   |  5 ++
 .../java/com/cloud/alert/AlertManagerImpl.java     | 12 ++++-
 .../com/cloud/capacity/CapacityManagerImpl.java    | 11 +++++
 .../main/java/com/cloud/server/StatsCollector.java | 55 +++++++++++-----------
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  | 15 ++++--
 setup/bindir/cloud-setup-databases.in              |  2 +-
 .../integration/component/test_mm_domain_limits.py |  2 +-
 7 files changed, 67 insertions(+), 35 deletions(-)