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
omit 45509e5b753 do not merge
add bf9c71430b6 CKS: check access when get kubernetescluster config (#7854)
add 2c6072273b8 VMware: Fix casting exception during backup NIC
synchronization (#7831)
add 72e3491cefa server: Fix allocation of more public IPs than the
account's limit (#7832)
add a47a4f4ad4f CPVM: fix cpu usage for console vm when using vnc over
websockets (#6970)
add aa02d9b3c15 test: skip live storage migration on CentOS 7 (#7862)
add 5559668f126 Merge branch '4.18'
add fe70f4d801c Remove powermock from services (#7860)
add 51509c5a84e 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 (45509e5b753)
\
N -- N -- N refs/heads/dummy (51509c5a84e)
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:
.../NonStrictHostAntiAffinityProcessorTest.java | 4 +-
.../java/com/cloud/hypervisor/guru/VMwareGuru.java | 6 +--
.../cluster/KubernetesClusterManagerImpl.java | 2 +
.../com/cloud/network/IpAddressManagerImpl.java | 37 +++++++++----
.../com/cloud/network/IpAddressManagerTest.java | 60 ++++++++++++++++++++++
.../src/test/java/common/ClientTest.java | 8 +--
.../org.mockito.plugins.MockMaker | 0
.../consoleproxy/ConsoleProxyNoVncClient.java | 5 ++
.../ConsoleProxyHttpHandlerHelperTest.java | 33 ++++++------
.../org.mockito.plugins.MockMaker | 0
.../resource/NfsSecondaryStorageResourceTest.java | 46 ++++++++---------
.../org.mockito.plugins.MockMaker | 0
test/integration/smoke/test_vm_life_cycle.py | 2 +-
13 files changed, 140 insertions(+), 63 deletions(-)
copy {agent =>
services/console-proxy/rdpconsole}/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
(100%)
copy {agent =>
services/console-proxy/server}/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
(100%)
copy {agent =>
services/secondary-storage/server}/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
(100%)
