mirror of https://github.com/apache/cloudstack.git
Conflicts: engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java engine/storage/volume/src/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java server/src/com/cloud/alert/AlertManagerImpl.java server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java server/src/com/cloud/configuration/ConfigurationManagerImpl.java server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java server/src/com/cloud/ha/HighAvailabilityManagerImpl.java server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java server/src/com/cloud/vm/UserVmManagerImpl.java usage/src/com/cloud/usage/UsageAlertManagerImpl.java usage/src/com/cloud/usage/UsageManagerImpl.java listAlerts: introduced new parameter "name" to the alertResponse Conflicts: api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java server/src/com/cloud/alert/AlertManagerImpl.java usage/src/com/cloud/usage/UsageAlertManagerImpl.java Added new Admin API - generateAlert. Available to ROOT admin only Conflicts: api/src/org/apache/cloudstack/alert/AlertService.java api/src/org/apache/cloudstack/api/BaseCmd.java usage/src/com/cloud/usage/UsageAlertManagerImpl.java listAlerts: implemented search by alert name Conflicts: api/src/org/apache/cloudstack/alert/AlertService.java api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java engine/schema/src/com/cloud/alert/AlertVO.java |
||
|---|---|---|
| .. | ||
| data-217to218.sql | ||
| schema-20to21.sql | ||
| schema-21to22-cleanup.sql | ||
| schema-21to22-premium.sql | ||
| schema-21to22.sql | ||
| schema-22beta1to22beta2.sql | ||
| schema-22beta3to22beta4.sql | ||
| schema-30to301.sql | ||
| schema-40to410-cleanup.sql | ||
| schema-40to410.sql | ||
| schema-217to218.sql | ||
| schema-221to222-cleanup.sql | ||
| schema-221to222-premium.sql | ||
| schema-221to222.sql | ||
| schema-222to224-cleanup.sql | ||
| schema-222to224-premium.sql | ||
| schema-222to224.sql | ||
| schema-224to225-cleanup.sql | ||
| schema-224to225.sql | ||
| schema-225to226.sql | ||
| schema-227to228-premium.sql | ||
| schema-227to228.sql | ||
| schema-228to229.sql | ||
| schema-229to2210.sql | ||
| schema-301to302-cleanup.sql | ||
| schema-301to302.sql | ||
| schema-302to40-cleanup.sql | ||
| schema-302to40.sql | ||
| schema-302to303.sql | ||
| schema-304to305-cleanup.sql | ||
| schema-304to305.sql | ||
| schema-305to306-cleanup.sql | ||
| schema-305to306.sql | ||
| schema-306to307.sql | ||
| schema-307to410-cleanup.sql | ||
| schema-307to410.sql | ||
| schema-410to420-cleanup.sql | ||
| schema-410to420.sql | ||
| schema-420to421.sql | ||
| schema-421to430-cleanup.sql | ||
| schema-421to430.sql | ||
| schema-430to440-cleanup.sql | ||
| schema-430to440.sql | ||
| schema-2210to2211.sql | ||
| schema-2211to2212-premium.sql | ||
| schema-2211to2212.sql | ||
| schema-2212to2213.sql | ||
| schema-2213to2214.sql | ||
| schema-2214to30-cleanup.sql | ||
| schema-2214to30.sql | ||
| schema-level.sql | ||
| schema-snapshot-217to224.sql | ||
| schema-snapshot-223to224.sql | ||