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

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


 discard f7df05e  please do not merge this;)
     add 54cc73a  Add missing HA config keys (#3776)
     add 6ebd02e  Agent lb on svm (#3795)
     add 8ef10c0  python/c++ formatting in java corrected (#3806)
     add b79a539  server: fix resource count error when upgrade a vm (#3759)
     add b581f85  fixed inconsistency of IP on VR when VR is destroyed and 
recrea… (#3825)
     add ff1c6e7  router: Set up metadata/password/dhcp server on gateway IP 
instead of guest IP in RVR (#3477)
     add 71e53ab  server: Capacity check should take vms in Migrating state 
into calculation (#3727)
     add 136505b  server: double check host capacity when start/migrate a vm 
(#3728)
     add a77d74b  server: Fix NPE while update displayvm on vm with dynamic 
service offering (#3758)
     add 8792070  Rethrow takeVMSnapshot() exception instead of returning null 
in VMSnapshotManagerImpl (#3761)
     add b1783fb  travis: use https based maven repo mirror (#3845)
     add 4ea6f32  ui: Fixed unable to edit domain settings (#3846)
     add be112a0  vrouter: reload haproxy when cfg file is updated (#3726)
     add 521217c  vr: fix vr in unknown state (more) (#3848)
     add 1c130a5  api: metrics API response is not super-set of resources 
response keys (#3834)
     add 7a25e40  api: allow listing management server by id and name (#3840)
     add 82d94a8  Fix Policy Based Routing for private gateway static routes 
(#3604)
     add 6baa598  Clean up inactive iscsi sessions when VMs get moved due to 
crashes (#3819)
     add 9d105b6  template: copy md5 mismatch (#3383)
     add 76fb811  kvm: Fix router migration issue when router has 
control/public nics on other physical network than guest (#3855)
     add 75aa6e3  ui: fix cannot assign vms to internal lb in VPC (#3832)
     add a718746  server: fix checking disk offering access for snapshot volume 
(#3791)
     add 70daee9  network: set restart_required to 0 after restarting network 
(#3803)
     add c22e99c  test: check more connectivity in test_privategw_acl.py (#3861)
     add bfdb914  usage: publish zone id while uploading template and volume 
(#3867)
     add a9a1737  vpc: set traffic type of private gateway IP to Public to fix 
ke… (#3851)
     add d88c614  vr: add missing rule for port forwarding rule in vpc (#3857)
     add f769c66  ui: fix default text missing from network selection on 
instance wizard (#3865)
     add cd55674  packaging: install python-dnspython or python-dns to fix 
issue with cloudstack-setup-management (#3854)
     add afcbbc4  systemvm: list systemvm does not return agent state and 
version (#3870)
     add 78cc0a4  server: use host record related to a ssvm/cpvm (#3876)
     add 5ae65bf  ui: Fixed root volume resize from ui (#3873)
     add a443f31  jobs: fixed duplicate id error when creating VM work jobs 
(#3871)
     add bbe2bf1  server: ignore site to site vpn status check on internallbvm 
(#3864)
     add 649ed45  kvm: fix exception in volume statts after storage migration 
(#3884)
     add 37d2b85  kvm: Enable virtio drivers based on guest os display name 
(#3879)
     add ac7bcde  KVM: Propagating changes on host parameters to the agents 
(#3491)
     add e269b14  Fix network rules issue if default egress policy is Allow 
(#3905)
     add 4d8a2da  api: Fix count and item issues returned by list APIs (#3894)
     add abb39a2  server: send VM password to all Running VRs in network/vpc 
(#3903)
     add 7e30e3d  router: Avoid duplicate alerts when router state changes 
(#3904)
     add e8d418c  router: Fix dhcp infinite lease time (#3913)
     add 79f7f0f  server: fix issue while list ssh keypairs by keyword (#3916)
     add faccec4  Allow port 80/8080 accessible only from guest network (#3907)
     add 3f8b2c3  vrouter: reload keepalived instead of restart and fix 
password… (#3898)
     add 313e21a  VR: Fix Redundant VRouter guest network on wrong interface 
(#3847)
     add b4fdf22  kvm: fix/optimize propogating configs (#3911)
     add 4be7001  Fixed error on data volumes lager than 2.14TB when creating 
ins… (#3924)
     add bd7d41b  server: fix VM with ISO attached migration issue (#3935)
     add 0fab5e8  server: fix database exception while searching network 
offerings (#3947)
     add c4d09f8  please do not 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   (f7df05e)
            \
             N -- N -- N   refs/heads/health-4.13 (c4d09f8)

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/bindir/libvirtqemuhook.in                    |   6 +-
 api/src/main/java/com/cloud/projects/Project.java  |   2 +-
 .../api/command/admin/cluster/ListClustersCmd.java |   8 +-
 .../api/command/admin/management/ListMgmtsCmd.java |   3 +-
 .../cloudstack/api/response/ClusterResponse.java   |   7 +-
 .../cloudstack/api/response/HostResponse.java      |  37 +-
 .../cloudstack/api/response/SystemVmResponse.java  |  44 +-
 .../cloudstack/api/response/VolumeResponse.java    |  33 +-
 .../cloudstack/api/response/ZoneResponse.java      |   2 +-
 .../management/ManagementServerHost.java           |   9 +-
 .../virtualnetwork/VirtualRoutingResource.java     |   7 +-
 debian/control                                     |   2 +-
 .../main/java/com/cloud/agent/AgentManager.java    |   4 +
 .../java/com/cloud/ha/HighAvailabilityManager.java |  46 +-
 .../com/cloud/agent/manager/AgentManagerImpl.java  |  41 ++
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |  11 +
 .../cloud/vm/VirtualMachinePowerStateSyncImpl.java |   6 +-
 .../engine/orchestration/NetworkOrchestrator.java  |  12 +-
 .../src/main/java/com/cloud/host/dao/HostDao.java  |   2 +
 .../main/java/com/cloud/host/dao/HostDaoImpl.java  |  13 +
 .../com/cloud/network/vpc/dao/VpcGatewayDao.java   |   2 +
 .../cloud/network/vpc/dao/VpcGatewayDaoImpl.java   |   7 +
 .../java/com/cloud/vm/dao/DomainRouterDao.java     |   7 +
 .../java/com/cloud/vm/dao/DomainRouterDaoImpl.java |   8 +
 .../java/com/cloud/vm/dao/VMInstanceDaoImpl.java   |   2 +-
 .../storage/datastore/db/ImageStoreDao.java        |   2 +
 .../storage/datastore/db/ImageStoreDaoImpl.java    |   8 +
 .../storage/image/TemplateDataFactoryImpl.java     |   2 +-
 .../storage/image/TemplateServiceImpl.java         |   4 +
 .../cloudstack/agent/lb/IndirectAgentLB.java       |   5 +-
 .../main/java/com/cloud/utils/db/GenericDao.java   |   2 +
 .../java/com/cloud/utils/db/GenericDaoBase.java    |   9 +
 .../framework/jobs/impl/AsyncJobManagerImpl.java   |   6 +
 packaging/centos7/cloud.spec                       |   2 +
 .../kvm/resource/LibvirtComputingResource.java     | 114 +--
 .../LibvirtSetHostParamsCommandWrapper.java        |   1 +
 .../kvm/storage/IscsiStorageCleanupMonitor.java    | 173 +++++
 .../storage/resource/VmwareStorageProcessor.java   |   2 +-
 .../cloudstack/api/ListClustersMetricsCmd.java     |   8 +-
 .../apache/cloudstack/api/ListHostsMetricsCmd.java |   6 +-
 .../cloudstack/api/ListStoragePoolsMetricsCmd.java |   6 +-
 .../apache/cloudstack/api/ListVMsMetricsCmd.java   |   6 +-
 .../cloudstack/api/ListVolumesMetricsCmd.java      |   6 +-
 .../apache/cloudstack/api/ListZonesMetricsCmd.java |   6 +-
 .../apache/cloudstack/metrics/MetricsService.java  |   3 +-
 .../cloudstack/metrics/MetricsServiceImpl.java     |  25 +-
 .../response/InfrastructureResponse.java           |  12 +
 server/src/main/java/com/cloud/api/ApiDBUtils.java |   4 +
 .../main/java/com/cloud/api/ApiResponseHelper.java |  14 +-
 .../java/com/cloud/api/query/QueryManagerImpl.java |  55 +-
 .../cloud/api/query/dao/DataCenterJoinDaoImpl.java |   2 +-
 .../com/cloud/api/query/dao/HostJoinDaoImpl.java   |   2 +-
 .../com/cloud/capacity/CapacityManagerImpl.java    |  63 +-
 .../main/java/com/cloud/configuration/Config.java  |  43 +-
 .../configuration/ConfigurationManagerImpl.java    | 206 +++---
 .../com/cloud/ha/HighAvailabilityManagerImpl.java  | 109 +--
 .../main/java/com/cloud/hypervisor/KVMGuru.java    |   2 +-
 .../java/com/cloud/network/NetworkModelImpl.java   |  12 +-
 .../network/element/VirtualRouterElement.java      |  26 +-
 .../cloud/network/router/CommandSetupHelper.java   | 143 ++--
 .../router/VirtualNetworkApplianceManagerImpl.java |  25 +-
 .../com/cloud/server/ManagementServerImpl.java     |   8 +-
 .../main/java/com/cloud/server/StatsCollector.java |   8 +-
 .../cloud/storage/ImageStoreUploadMonitorImpl.java |  10 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java    |   4 +-
 .../storage/download/DownloadMonitorImpl.java      |  81 +-
 .../com/cloud/template/TemplateManagerImpl.java    |   6 +-
 .../main/java/com/cloud/test/DatabaseConfig.java   |  59 +-
 .../java/com/cloud/user/AccountManagerImpl.java    |  14 +-
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  |  29 +-
 .../cloud/vm/snapshot/VMSnapshotManagerImpl.java   |   2 +-
 .../agent/lb/IndirectAgentLBServiceImpl.java       |  89 ++-
 .../java/com/cloud/user/MockUsageEventDao.java     |   5 +
 .../agent/lb/IndirectAgentLBServiceImplTest.java   |   3 +-
 .../src/test/resources/createNetworkOffering.xml   |   1 +
 .../storage/template/DownloadManagerImpl.java      | 192 +++--
 systemvm/debian/etc/apache2/vhost.template         |  10 +-
 systemvm/debian/etc/sysctl.conf                    |   4 +
 systemvm/debian/opt/cloud/bin/configure.py         |  47 +-
 systemvm/debian/opt/cloud/bin/cs/CsAddress.py      |  17 +-
 systemvm/debian/opt/cloud/bin/cs/CsApp.py          |  15 +-
 systemvm/debian/opt/cloud/bin/cs/CsDhcp.py         |  45 +-
 systemvm/debian/opt/cloud/bin/cs/CsFile.py         |  14 +
 systemvm/debian/opt/cloud/bin/cs/CsHelper.py       |   8 +-
 systemvm/debian/opt/cloud/bin/cs/CsLoadBalancer.py |   2 +-
 systemvm/debian/opt/cloud/bin/cs/CsRedundant.py    |  28 +-
 systemvm/debian/opt/cloud/bin/passwd_server_ip.py  |  11 +-
 systemvm/debian/opt/cloud/bin/setup/secstorage.sh  |   8 +-
 .../test_multiple_subnets_in_isolated_network.py   | 701 ++++++++++++++++++
 ...est_multiple_subnets_in_isolated_network_rvr.py | 687 +++++++++++++++++
 .../component/test_multiple_subnets_in_vpc.py      | 817 +++++++++++++++++++++
 .../component/test_multiple_subnets_in_vpc_rvr.py  | 817 +++++++++++++++++++++
 test/integration/smoke/test_privategw_acl.py       |   9 +
 tools/marvin/marvin/lib/base.py                    |  10 +-
 tools/marvin/marvin/lib/utils.py                   |   4 +-
 tools/travis/before_install.sh                     |   2 +-
 ui/css/cloudstack3.css                             |   5 +
 ui/scripts/storage.js                              |  11 +-
 ui/scripts/system.js                               |  43 +-
 ui/scripts/ui-custom/instanceWizard.js             |   5 +-
 ui/scripts/ui/widgets/listView.js                  |   6 +-
 .../cloudstack/utils/security/ChecksumValue.java   |   3 +-
 .../hypervisor/vmware/mo/VirtualMachineMO.java     |   6 +-
 103 files changed, 4519 insertions(+), 762 deletions(-)
 create mode 100644 
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/IscsiStorageCleanupMonitor.java
 create mode 100644 
test/integration/component/test_multiple_subnets_in_isolated_network.py
 create mode 100644 
test/integration/component/test_multiple_subnets_in_isolated_network_rvr.py
 create mode 100644 test/integration/component/test_multiple_subnets_in_vpc.py
 create mode 100644 
test/integration/component/test_multiple_subnets_in_vpc_rvr.py

Reply via email to