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 22f6c19248408385007d9e56f357630f5abea6f8
Merge: 6d0d701 ca8920d
Author: Rohit Yadav <[email protected]>
AuthorDate: Fri Apr 9 13:21:07 2021 +0530

    Merge remote-tracking branch 'origin/4.15'

 .../java/com/cloud/capacity/CapacityManager.java   |   4 +
 .../resources/META-INF/db/schema-41500to41510.sql  |  33 +++++
 .../manager/allocator/impl/RandomAllocator.java    | 135 ++++++++++-----------
 .../java/com/cloud/hypervisor/XenServerGuru.java   |  10 +-
 ...ernetesClusterResourceModifierActionWorker.java |   1 -
 .../manager/allocator/impl/FirstFitAllocator.java  |  25 +---
 .../com/cloud/capacity/CapacityManagerImpl.java    |  18 +++
 test/integration/smoke/test_kubernetes_clusters.py | 106 +++++++++-------
 8 files changed, 195 insertions(+), 137 deletions(-)

Reply via email to