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:31:37 UTC

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

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

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

commit 6bde1384ff59f5c57c68ae39f811b0b75c8484af
Merge: 66d49c5 29e3098
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Fri Feb 5 16:01:01 2021 +0530

    Merge remote-tracking branch 'origin/4.14' into 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 +++++++++++-----------
 setup/bindir/cloud-setup-databases.in              |  2 +-
 .../integration/component/test_mm_domain_limits.py |  2 +-
 6 files changed, 56 insertions(+), 31 deletions(-)