This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch dummy
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
discard eba1a078201 do not merge
add 0dd6bb7c67b systemvm: update size and state of systemvm template
during registration (#7874)
add 26581b77411 server: throw new exception when rootdisksize is required
but not set (#7913)
add 7362e5338c9 Merge remote-tracking branch 'origin/4.18'
add 171038eb8ad do not 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 (eba1a078201)
\
N -- N -- N refs/heads/dummy (171038eb8ad)
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/command/user/vm/DeployVMCmd.java | 4 ++--
.../upgrade/SystemVmTemplateRegistration.java | 28 ++++++++++++----------
.../java/com/cloud/storage/StorageManagerImpl.java | 2 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 17 +++++++------
4 files changed, 28 insertions(+), 23 deletions(-)