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 eac8e2f34d4 do not merge
add e333f2705aa user-shared networks: fix few issues (#6887)
add c0128e2f9a4 Improve template download error message (#8029)
add c3aeba1f4a4 Merge remote-tracking branch 'origin/4.18'
add b58ffec4cd2 [cleanup] Deleted file FakeDhcpSnooper.java and
DhcpSnooper.java (#7672)
add 66e5d41a15f ui: Fix sorter across different components (#8046)
add e0ab2a4bd4a Enable four more `flake8` rules (#7811)
add 7e998f92283 pre-commit: add hook `check-merge-conflict` (#7883)
add 9b2f36dafd8 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 (eac8e2f34d4)
\
N -- N -- N refs/heads/dummy (9b2f36dafd8)
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:
.github/linters/.flake8 | 9 +-
.pre-commit-config.yaml | 2 +-
.../java/com/cloud/agent/dhcp/DhcpSnooper.java | 41 ------
.../java/com/cloud/agent/dhcp/FakeDhcpSnooper.java | 161 ---------------------
.../apache/cloudstack/api/ResponseGenerator.java | 2 +-
....java => ListPrivateGatewaysCmdByAdminCmd.java} | 19 ++-
.../command/user/vpc/CreatePrivateGatewayCmd.java | 2 +-
.../command/user/vpc/ListPrivateGatewaysCmd.java | 7 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 6 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 61 +++++---
.../com/cloud/server/ManagementServerImpl.java | 2 +
.../direct/download/DirectDownloadManagerImpl.java | 12 +-
test/integration/component/test_ip_reservation.py | 6 +-
ui/src/components/view/EventsTab.vue | 2 +-
ui/src/views/AutogenView.vue | 2 +-
ui/src/views/compute/ChangeAffinity.vue | 6 +-
ui/src/views/compute/ResetSshKeyPair.vue | 2 +-
ui/src/views/compute/ResetUserData.vue | 2 +-
ui/src/views/infra/CpuSockets.vue | 6 +-
ui/src/views/infra/Metrics.vue | 4 +-
20 files changed, 102 insertions(+), 252 deletions(-)
delete mode 100644 agent/src/main/java/com/cloud/agent/dhcp/DhcpSnooper.java
delete mode 100644
agent/src/main/java/com/cloud/agent/dhcp/FakeDhcpSnooper.java
copy
api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/{ListVPCsCmdByAdmin.java
=> ListPrivateGatewaysCmdByAdminCmd.java} (59%)
