This is an automated email from the ASF dual-hosted git repository.
rohit pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from c84198d Merge remote-tracking branch 'origin/4.16'
add 204fd5c merge: fix forward merge import issue
No new revisions were added by this update.
Summary of changes:
server/src/main/java/com/cloud/resource/ResourceManagerImpl.java | 5 ++---
utils/src/main/java/com/cloud/utils/ssh/SSHCmdHelper.java | 1 -
2 files changed, 2 insertions(+), 4 deletions(-)