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:22:20 UTC

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

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(-)