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

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


 discard 50a4d4dc0f0 4.20/main Health Check, please don't merge this!
     add be22bfe2c9d Management Server - Prepare for Maintenance and Cancel 
Maintenance improvements (#10995)
     add f014daf3692 4.20/main Health Check, please don't merge this!

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (50a4d4dc0f0)
            \
             N -- N -- N   refs/heads/healthcheck-main (f014daf3692)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 agent/src/main/java/com/cloud/agent/Agent.java     |  32 +++--
 .../exception/OperationTimedoutException.java      |   2 +-
 .../java/com/cloud/resource/ResourceState.java     |   7 +-
 .../org/apache/cloudstack/api/ApiConstants.java    |   1 +
 .../command/admin/systemvm/PatchSystemVMCmd.java   |   4 +-
 .../cloudstack/agent/lb/SetupMSListCommand.java    |   9 +-
 .../main/java/com/cloud/agent/AgentManager.java    |   2 +-
 .../com/cloud/agent/manager/AgentManagerImpl.java  |   5 +-
 .../agent/manager/ClusteredAgentManagerImpl.java   |  30 ++--
 .../src/main/java/com/cloud/host/dao/HostDao.java  |  18 ++-
 .../main/java/com/cloud/host/dao/HostDaoImpl.java  |  42 +++++-
 .../cloudstack/agent/lb/IndirectAgentLB.java       |   8 +-
 .../api/command/CancelMaintenanceCmd.java          |  10 ++
 .../api/command/PrepareForMaintenanceCmd.java      |   8 ++
 .../ManagementServerMaintenanceManager.java        |  13 +-
 .../ManagementServerMaintenanceManagerImpl.java    | 159 +++++++++++++++------
 ...eForMaintenanceManagementServerHostCommand.java |   8 +-
 ...ManagementServerMaintenanceManagerImplTest.java |  36 +++--
 .../configuration/ConfigurationManagerImpl.java    |  31 ++--
 .../agent/lb/IndirectAgentLBServiceImpl.java       | 107 ++++++++++----
 .../agent/lb/IndirectAgentLBServiceImplTest.java   |   4 +-
 ui/public/locales/en.json                          |   1 +
 ui/src/config/section/infra/managementServers.js   |   2 +-
 ui/src/views/AutogenView.vue                       |   8 +-
 ui/src/views/infra/Confirmation.vue                |   7 +
 .../java/com/cloud/utils/nio/NioConnection.java    |   2 +-
 26 files changed, 411 insertions(+), 145 deletions(-)

Reply via email to