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 <[email protected]> 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(-)
