This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch healthcheck-4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
discard bd85fa88321 DO NOT MERGE
add 4748c3fd4d2 test: cleanup acl in test_global_acls.py (#10893)
add 6e19c07da10 Fixed typos (#10882)
add bb79f0b727e engine/schema: create default network offering for vpc
tier with conserve_mode=1 for fresh installation (#10744) (#10843)
add b760b0262f2 Fix issue with configdrive on XenServer (#10912)
add 58b56fa2707 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 (bd85fa88321)
\
N -- N -- N refs/heads/healthcheck-4.19 (58b56fa2707)
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:
.../engine/orchestration/NetworkOrchestrator.java | 2 +-
.../cloud/hypervisor/vmware/manager/VmwareManagerImpl.java | 14 +++++++-------
.../wrapper/xenbase/CitrixStartCommandWrapper.java | 3 ++-
.../com/cloud/configuration/ConfigurationManagerImpl.java | 2 +-
test/integration/smoke/test_global_acls.py | 1 +
utils/src/main/java/com/cloud/utils/net/NetUtils.java | 2 +-
utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java | 4 ++--
7 files changed, 15 insertions(+), 13 deletions(-)
