[cloudstack] branch master updated (e1dd07a -> c1fb6b4)

[da...@apache.org]

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

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


    from e1dd07a  Ability to put a server in Down state to maintenance (#4363)
     add b9f15fd  Remove cpu core from op_host_capacity when host is deleted (#4367)
     new c1fb6b4  Merge branch '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:
 server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java | 1 +
 server/src/main/java/com/cloud/resource/ResourceManagerImpl.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

[cloudstack] 01/01: Merge branch '4.14'

[da...@apache.org]

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

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

commit c1fb6b4cb90afd0b16971b52f1d9431a68374e75
Merge: e1dd07a b9f15fd
Author: Daan Hoogland <da...@shapeblue.com>
AuthorDate: Wed Oct 28 10:28:10 2020 +0100

    Merge branch '4.14'

 server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java | 1 +
 server/src/main/java/com/cloud/resource/ResourceManagerImpl.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)