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

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


 discard 9f7c236a2ba 4.21/main Health Check, please don't merge this!
     add 309b444205a pom.xml: update jetty version (#11793)
     add 4d95f08a3ab Delete template from storage pool instantly if no volume 
is using it (#11782)
     add 86cad79c156 importvm: fix IP address allocation on Shared networks 
(#11811)
     add 6f931dbd005 agent: increase timeout for host arch retrieval (#11254) 
(#11822)
     add 43278710362 Routed: fix create network exception when auto-allocation 
is disabled (#11624)
     add b82369c2415 systemvm: fix duplicated "en_US.UTF-8 UTF-8" in 
/etc/locale.gen (#11823)
     add eee43e534fa cloudutils: fix warning, error during kvm agent 
installation (#11318)
     add c8d44d92a76 api,server: fix entity access
     add 03a4b9f4fd3 server,utils: improve js interpretation functionality
     add 8b9f5fd8f96 Merge branch '4.20'
     add e7a55a766c5 Fixes for Import VM Tasks listing (#11841)
     add 3d0e737cbca 4.21/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   (9f7c236a2ba)
            \
             N -- N -- N   refs/heads/healthcheck-main (3d0e737cbca)

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:
 agent/src/main/java/com/cloud/agent/Agent.java     |   2 +-
 .../java/com/cloud/server/ManagementService.java   |  13 +-
 .../java/com/cloud/server/ResourceManagerUtil.java |   1 +
 .../org/apache/cloudstack/api/ApiConstants.java    |   2 +-
 .../api/command/admin/vm/ListImportVMTasksCmd.java |  15 +-
 .../api/response/ImportVMTaskResponse.java         |  12 ++
 .../org/apache/cloudstack/vm/ImportVmTask.java     |  15 +-
 .../apache/cloudstack/vm/ImportVmTasksManager.java |   2 +-
 .../java/com/cloud/template/TemplateManager.java   |   9 ++
 .../engine/orchestration/NetworkOrchestrator.java  |  20 ++-
 .../orchestration/NetworkOrchestratorTest.java     |   2 +-
 .../com/cloud/storage/dao/VMTemplatePoolDao.java   |   2 +
 .../cloud/storage/dao/VMTemplatePoolDaoImpl.java   |  10 ++
 .../src/main/java/com/cloud/vm/ImportVMTaskVO.java |  11 ++
 .../java/com/cloud/vm/dao/ImportVMTaskDao.java     |   6 +-
 .../java/com/cloud/vm/dao/ImportVMTaskDaoImpl.java |  13 +-
 .../storage/datastore/db/PrimaryDataStoreDao.java  |   1 +
 .../datastore/db/PrimaryDataStoreDaoImpl.java      |  14 ++
 .../resources/META-INF/db/schema-42100to42200.sql  |   3 +-
 .../apache/cloudstack/quota/QuotaManagerImpl.java  |   4 +-
 .../cloudstack/quota/QuotaManagerImplTest.java     |   5 +-
 .../api/response/QuotaResponseBuilderImpl.java     |  19 ++-
 .../org/apache/cloudstack/quota/QuotaService.java  |  12 +-
 .../apache/cloudstack/quota/QuotaServiceImpl.java  |   9 ++
 .../cloudstack/metrics/MetricsServiceImpl.java     |  76 ++++++++-
 .../cloudstack/metrics/MetricsServiceImplTest.java | 163 +++++++++++++++----
 pom.xml                                            |   2 +-
 python/lib/cloudutils/configFileOps.py             |   8 +-
 python/lib/cloudutils/networkConfig.py             |  13 +-
 python/lib/cloudutils/utilities.py                 |   2 +-
 .../java/com/cloud/api/query/QueryManagerImpl.java |   2 +-
 .../cloud/network/vpc/NetworkACLServiceImpl.java   |   3 +
 .../com/cloud/resource/ResourceManagerImpl.java    |  10 +-
 .../com/cloud/server/ManagementServerImpl.java     |  22 ++-
 .../java/com/cloud/storage/StorageManagerImpl.java |   9 ++
 .../com/cloud/tags/ResourceManagerUtilImpl.java    |  11 ++
 .../cloud/template/HypervisorTemplateAdapter.java  |  11 +-
 .../com/cloud/template/TemplateManagerImpl.java    |  55 +++++--
 .../cloudstack/network/RoutedIpv4ManagerImpl.java  |  42 +++--
 .../cloudstack/vm/ImportVmTasksManagerImpl.java    |  62 ++++---
 .../cloudstack/vm/UnmanagedVMsManagerImpl.java     |  11 +-
 .../network/RoutedIpv4ManagerImplTest.java         |   4 +-
 .../cloudstack/vm/UnmanagedVMsManagerImplTest.java |   1 -
 .../systemvmtemplate/scripts/configure_locale.sh   |   4 +-
 ui/public/locales/en.json                          |   7 +
 ui/src/views/tools/ImportVmTasks.vue               | 179 ++++++++++++++-------
 ui/src/views/tools/ManageInstances.vue             |  39 +++--
 .../utils/jsinterpreter/JsInterpreter.java         | 169 ++++++++++++-------
 .../utils/jsinterpreter/TagAsRuleHelper.java       |   7 +-
 .../utils/jsinterpreter/JsInterpreterTest.java     |  81 ++++++----
 50 files changed, 879 insertions(+), 316 deletions(-)

Reply via email to