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 06be550b6c2 do not merge
add 16d45f731d7 Save the account which deliberately removed a public IP
from quarantine (#8339)
add 33e2a4dd663 VPC: update default network offering for vpc tier to
conserve_mode=1 (#8309)
add 40efb5b0032 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 (06be550b6c2)
\
N -- N -- N refs/heads/dummy (40efb5b0032)
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:
.../java/com/cloud/network/PublicIpQuarantine.java | 2 +
.../org/apache/cloudstack/api/ApiConstants.java | 1 +
.../api/response/IpQuarantineResponse.java | 12 +++++
.../com/cloud/network/vo/PublicIpQuarantineVO.java | 12 +++++
.../com/cloud/upgrade/dao/Upgrade41810to41900.java | 4 ++
.../resources/META-INF/db/schema-41810to41900.sql | 5 ++
.../main/java/com/cloud/api/ApiResponseHelper.java | 4 ++
.../com/cloud/network/IpAddressManagerImpl.java | 2 +
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 4 +-
.../java/com/cloud/api/ApiResponseHelperTest.java | 56 ++++++++++++++++++++++
.../com/cloud/network/IpAddressManagerTest.java | 27 +++++++++++
test/integration/component/test_vpc_network.py | 10 ++--
12 files changed, 132 insertions(+), 7 deletions(-)
