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

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


    omit bdf29b87799 dummy commit , please don't merge
     add afc95f1ccc5 CheckOnHostCommand: add missing timeout setting (#9677)
     add 7adc7329922 upgrade: consider multiple hypervisors and secondary 
storages (#10046)
     add fce77733a5d no retrieval of null hosts (#10175)
     add 35fe19f096d systemvm: fix keystore is reset when patch a systemvm 
(#9900)
     add e2cfddb1b6a Merge branch '4.19' into 4.20
     add d9a7b6e511b Rollback of changes with errors during the VM assign 
(#7061)
     add df2d2a221a3 dummy commit , please don't merge

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   (bdf29b87799)
            \
             N -- N -- N   refs/heads/healthcheck-4.20 (df2d2a221a3)

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:
 api/src/main/java/com/cloud/vm/UserVmService.java  |    2 +-
 .../api/command/admin/vm/AssignVMCmd.java          |   21 +-
 .../com/cloud/agent/api/CheckOnHostCommand.java    |    3 +-
 .../upgrade/SystemVmTemplateRegistration.java      |   23 +-
 .../java/com/cloud/storage/StorageManagerImpl.java |    2 +-
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  | 1107 ++++++++------
 .../java/com/cloud/vm/UserVmManagerImplTest.java   | 1533 +++++++++++++++++++-
 .../test/java/com/cloud/vm/UserVmManagerTest.java  |    4 +-
 systemvm/patch-sysvms.sh                           |    3 +
 9 files changed, 2224 insertions(+), 474 deletions(-)

Reply via email to