This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to branch healthcheck-main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


 discard 5aabb9b05b3 4.23/main Health Check, please don't merge this!
     add a566af35f5c Review comment on pull request #12436
     add b31c2f4cae1 Revert "Review comment on pull request #12436"
     add 002d9768b28 Add settings to mark cryptographic algorithms in vpn 
customer gateways as excluded or obsolete (#12193)
     add 8b2f1f19c27 Support dedicating backup offerings to domains (#12194)
     add aba3285c3c8 [Usage] Include accounts uuid on the cloud_usage accounts 
initial saving (#12420)
     add f1f779a08d9 Cleanup snapshot files in datastores for Error-ed 
snapshots, and some code improvements (#12347)
     add 76e6de7f90e ui: fix form data double fetch/reset form data by 
ownership selection (#11705)
     add 3828a3b744a Merge branch '4.20' into 4.22
     add 04b58acdd64 Merge branch '4.22'
     add c11543bd5a3 4.23/main Health Check, please don't merge this!

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   (5aabb9b05b3)
            \
             N -- N -- N   refs/heads/healthcheck-main (c11543bd5a3)

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/src/main/java/com/cloud/event/EventTypes.java  |   2 +
 .../main/java/com/cloud/user/AccountService.java   |   3 +
 .../org/apache/cloudstack/acl/SecurityChecker.java |   4 +
 .../org/apache/cloudstack/alert/AlertService.java  |   1 +
 .../org/apache/cloudstack/api/ApiConstants.java    |   4 +
 .../apache/cloudstack/api/BaseBackupListCmd.java   |   2 +-
 .../admin/backup/ImportBackupOfferingCmd.java      |  22 +
 .../admin/backup/UpdateBackupOfferingCmd.java      |  28 +-
 .../admin/network/UpdateNetworkOfferingCmd.java    |  65 +-
 .../admin/offering/UpdateDiskOfferingCmd.java      |  62 +-
 .../admin/offering/UpdateServiceOfferingCmd.java   |  62 +-
 .../command/admin/vpc/UpdateVPCOfferingCmd.java    |  64 +-
 .../command/offering/DomainAndZoneIdResolver.java  | 114 +++
 .../command/user/config/ListCapabilitiesCmd.java   |  16 +
 .../api/response/BackupOfferingResponse.java       |  19 +
 .../api/response/CapabilitiesResponse.java         |  10 +
 .../response/Site2SiteCustomerGatewayResponse.java |  16 +
 .../apache/cloudstack/backup/BackupManager.java    |   2 +
 .../offering/DomainAndZoneIdResolverTest.java      | 149 ++++
 .../subsystem/api/storage/SnapshotDataFactory.java |   2 +
 .../java/com/cloud/storage/dao/SnapshotDao.java    |   2 +
 .../com/cloud/storage/dao/SnapshotDaoImpl.java     |   7 +
 .../java/com/cloud/usage/dao/UsageDaoImpl.java     |  17 +-
 .../backup/BackupOfferingDetailsVO.java}           |  19 +-
 .../apache/cloudstack/backup/BackupOfferingVO.java |   7 +
 .../backup/dao/BackupOfferingDaoImpl.java          |  23 +-
 .../dao/BackupOfferingDetailsDao.java}             |   9 +-
 .../dao/BackupOfferingDetailsDaoImpl.java}         |  45 +-
 .../storage/datastore/db/SnapshotDataStoreDao.java |   2 +
 .../datastore/db/SnapshotDataStoreDaoImpl.java     |   7 +
 ...n-daos-between-management-and-usage-context.xml |   3 +-
 .../resources/META-INF/db/schema-42210to42300.sql  |  10 +
 .../dao/BackupOfferingDetailsDaoImplTest.java      | 251 ++++++
 .../storage/snapshot/DefaultSnapshotStrategy.java  |   2 +-
 .../storage/snapshot/SnapshotDataFactoryImpl.java  |  22 +-
 .../storage/snapshot/SnapshotServiceImpl.java      |   9 +-
 .../snapshot/StorageSystemSnapshotStrategy.java    |   1 -
 .../datastore/ObjectInDataStoreManagerImpl.java    |   3 +
 .../config/ConfigKeyScheduledExecutionWrapper.java |   2 +-
 plugins/hypervisors/ovm3/sonar-project.properties  |   2 +-
 .../contrail/management/MockAccountManager.java    |   6 +
 .../storage/datastore/util/StorPoolHelper.java     |   2 +-
 .../storage/snapshot/StorPoolSnapshotStrategy.java |   4 +-
 pom.xml                                            |   2 +
 .../src/main/java/com/cloud/acl/DomainChecker.java |  33 +
 .../java/com/cloud/alert/AlertManagerImpl.java     |   3 +-
 .../main/java/com/cloud/api/ApiResponseHelper.java |  13 +
 .../configuration/ConfigurationManagerImpl.java    |  47 +-
 .../java/com/cloud/network/vpc/VpcManagerImpl.java |  31 +-
 .../com/cloud/network/vpn/Site2SiteVpnManager.java |   6 +
 .../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 279 +++++-
 .../com/cloud/server/ManagementServerImpl.java     |  56 +-
 .../java/com/cloud/storage/StorageManagerImpl.java | 101 +--
 .../storage/snapshot/SnapshotManagerImpl.java      |  31 +-
 .../java/com/cloud/user/AccountManagerImpl.java    |  16 +
 .../main/java/com/cloud/utils/DomainHelper.java    |  63 ++
 .../cloudstack/backup/BackupManagerImpl.java       | 117 ++-
 .../core/spring-server-core-misc-context.xml       |   2 +
 .../test/java/com/cloud/acl/DomainCheckerTest.java |  45 +
 .../ConfigurationManagerImplTest.java              |   3 +
 .../network/vpn/Site2SiteVpnManagerImplTest.java   | 944 +++++++++++++++++++++
 .../storage/snapshot/SnapshotManagerImplTest.java  |   4 +-
 .../java/com/cloud/vm/UserVmManagerImplTest.java   |   3 +-
 .../com/cloud/vpc/MockSite2SiteVpnManagerImpl.java |  17 +-
 .../cloudstack/backup/BackupManagerTest.java       | 366 +++++++-
 .../networkoffering/CreateNetworkOfferingTest.java |   4 +
 tools/marvin/setup.py                              |   2 +-
 ui/public/locales/en.json                          |  22 +-
 ui/src/components/view/ListView.vue                |   8 +
 ui/src/config/section/network.js                   |  10 +-
 ui/src/config/section/offering.js                  |   6 +-
 ui/src/views/compute/DeployVM.vue                  |   4 +-
 ui/src/views/compute/wizard/OwnershipSelection.vue |  30 +-
 ui/src/views/network/CreateIsolatedNetworkForm.vue |   2 +-
 ui/src/views/network/CreateL2NetworkForm.vue       |   2 +-
 ui/src/views/network/CreateVpnCustomerGateway.vue  | 360 +-------
 ui/src/views/network/UpdateVpnCustomerGateway.vue  | 129 +++
 ui/src/views/network/VpnCustomerGateway.vue        | 581 +++++++++++++
 ui/src/views/offering/ImportBackupOffering.vue     |  69 +-
 ui/src/views/storage/CreateSharedFS.vue            |   8 +-
 ui/src/views/storage/CreateVolume.vue              |   4 +-
 81 files changed, 3724 insertions(+), 801 deletions(-)
 create mode 100644 
api/src/main/java/org/apache/cloudstack/api/command/offering/DomainAndZoneIdResolver.java
 create mode 100644 
api/src/test/java/org/apache/cloudstack/api/command/offering/DomainAndZoneIdResolverTest.java
 copy 
engine/schema/src/main/java/{com/cloud/network/vpc/VpcOfferingDetailsVO.java => 
org/apache/cloudstack/backup/BackupOfferingDetailsVO.java} (79%)
 copy 
engine/schema/src/main/java/org/apache/cloudstack/{resourcedetail/dao/DiskOfferingDetailsDao.java
 => backup/dao/BackupOfferingDetailsDao.java} (73%)
 copy 
engine/schema/src/main/java/org/apache/cloudstack/{resourcedetail/dao/DiskOfferingDetailsDaoImpl.java
 => backup/dao/BackupOfferingDetailsDaoImpl.java} (53%)
 create mode 100644 
engine/schema/src/test/java/org/apache/cloudstack/backup/dao/BackupOfferingDetailsDaoImplTest.java
 create mode 100644 server/src/main/java/com/cloud/utils/DomainHelper.java
 create mode 100644 
server/src/test/java/com/cloud/network/vpn/Site2SiteVpnManagerImplTest.java
 create mode 100644 ui/src/views/network/UpdateVpnCustomerGateway.vue
 create mode 100644 ui/src/views/network/VpnCustomerGateway.vue

Reply via email to