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

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


    from 514df7b3a05 Merge release branch 4.18 to main
     add 69be0af32d3 Allow admin/users to add comments to Management Servers 
(#7379)

No new revisions were added by this update.

Summary of changes:
 .../apache/cloudstack/annotation/AnnotationService.java   |  2 +-
 .../org/apache/cloudstack/api/ApiCommandResourceType.java |  3 ++-
 .../cloudstack/management/ManagementServerHost.java       |  3 ++-
 .../java/com/cloud/cluster/ManagementServerHostVO.java    | 15 +++++++++++++++
 .../cloudstack/annotation/AnnotationManagerImpl.java      | 10 ++++++++++
 test/integration/smoke/test_annotations.py                |  7 +++++++
 tools/marvin/marvin/lib/common.py                         |  9 +++++++++
 ui/src/components/view/AnnotationsTab.vue                 |  1 +
 ui/src/config/section/infra/managementServers.js          |  4 ++++
 9 files changed, 51 insertions(+), 3 deletions(-)

Reply via email to