[cloudstack] branch 4.14 updated (b64d0b2 -> b141b8e)

[ro...@apache.org]

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

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


    from b64d0b2  quota: Adding pagination for quotaSummary and quotaTariffList (#4186)
     add 4da374b  server: Dedicated hosts should be 'Not Suitable' while find hosts for vm migration (#4001)
     new b141b8e  Merge remote-tracking branch 'origin/4.13' into 4.14

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/main/java/com/cloud/deploy/DeploymentPlanningManager.java   | 3 +++
 .../main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java   | 6 ++----
 server/src/main/java/com/cloud/server/ManagementServerImpl.java     | 5 +++++
 3 files changed, 10 insertions(+), 4 deletions(-)

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

[ro...@apache.org]

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

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

commit b141b8e256c4d824052e62b2f4158b790cf67430
Merge: b64d0b2 4da374b
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Tue Jul 7 12:51:46 2020 +0530

    Merge remote-tracking branch 'origin/4.13' into 4.14

 .../src/main/java/com/cloud/deploy/DeploymentPlanningManager.java   | 3 +++
 .../main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java   | 6 ++----
 server/src/main/java/com/cloud/server/ManagementServerImpl.java     | 5 +++++
 3 files changed, 10 insertions(+), 4 deletions(-)