This is an automated email from the ASF dual-hosted git repository.
shwstppr pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 6b9f3fb Improve logs on KVMHAVMActivityChecker (#4705)
add 493d6a0 ui: Display Zone Name instead of Zone UUID in list view
(#5011)
add 4ecef4b ui: prevent same string docHelp override (#5014)
add aa28954 vmware: Fix deploy-as-is not honoured on upload from local
(#5015)
add 1b28ea1 network: fix dhcp/password/metadata issues on shared networks
with multiple subnets (#5013)
add 57c8286 ui: pass podid for basic zone createvlaniprange (#5022)
add cc7f426 ui: Allow IP range creation for Physical Network - Guest
Traffic in Basic Zones (#5020)
add 7557910 api/server: cpu, memory values with overprovisioning in
metrics response (#4795)
add dc91a1f server: destroy ssvm, cpvm on last host maintenance (#4644)
add e2183ed forceha: fix two issues when (1)stop vm from inside (2) force
remove host (#4647)
add 2286c8d Merge remote-tracking branch 'origin/4.14' into 4.15
add 06454ff tests: Fix in Marvin migrate_vm_with_volume (#5023)
new 426f14b Merge remote-tracking branch 'apache/4.15'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
api/src/main/java/com/cloud/agent/api/Command.java | 9 ++
.../java/com/cloud/resource/ResourceState.java | 1 +
.../template/GetUploadParamsForTemplateCmd.java | 10 ++
.../cloudstack/api/response/HostResponse.java | 8 +-
.../java/com/cloud/ha/HighAvailabilityManager.java | 2 +-
.../java/com/cloud/network/IpAddressManager.java | 3 +-
.../java/com/cloud/agent/manager/AgentAttache.java | 8 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 10 +-
.../cloudstack/metrics/MetricsServiceImpl.java | 15 ++-
.../cloudstack/response/HostMetricsResponse.java | 47 ++++-----
.../CloudStackPrimaryDataStoreDriverImpl.java | 24 ++++-
.../com/cloud/api/query/dao/HostJoinDaoImpl.java | 14 +--
.../consoleproxy/ConsoleProxyManagerImpl.java | 7 ++
.../com/cloud/ha/HighAvailabilityManagerImpl.java | 108 +++++++++++++--------
.../com/cloud/network/IpAddressManagerImpl.java | 28 +++---
.../com/cloud/network/rules/DhcpSubNetRules.java | 6 +-
.../com/cloud/resource/ResourceManagerImpl.java | 78 ++++++++-------
.../com/cloud/server/ManagementServerImpl.java | 2 +-
.../upload/params/TemplateUploadParams.java | 4 +-
.../storage/upload/params/UploadParamsBase.java | 6 +-
.../com/cloud/template/TemplateAdapterBase.java | 4 +-
.../cloud/ha/HighAvailabilityManagerImplTest.java | 6 ++
.../SecondaryStorageManagerImpl.java | 7 ++
systemvm/debian/opt/cloud/bin/configure.py | 1 +
tools/marvin/marvin/lib/base.py | 2 +-
ui/package.json | 2 +
.../scripts/consoleproxy.sh => ui/postbuild.sh | 25 ++---
.../scripts/consoleproxy.sh => ui/prebuild.sh | 36 ++++---
ui/public/config.json | 6 +-
ui/src/config/section/offering.js | 2 +-
ui/src/utils/plugins.js | 2 +-
ui/src/views/infra/network/IpRangesTabGuest.vue | 1 -
ui/src/views/infra/network/IpRangesTabPublic.vue | 87 +++++++++++++----
ui/src/views/infra/network/TrafficTypesTab.vue | 55 ++++++++++-
ui/src/views/network/CreateVlanIpRange.vue | 49 ++++++++++
35 files changed, 471 insertions(+), 204 deletions(-)
copy systemvm/agent/scripts/consoleproxy.sh => ui/postbuild.sh (68%)
copy systemvm/agent/scripts/consoleproxy.sh => ui/prebuild.sh (54%)