etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/engine/schema/src/com/cloud
History
Alena Prokharchyk bd6f706b72 CLOUDSTACK-5261: added support for Alert publishing via ROOT Admin API 
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
 		2013-12-04 10:05:46 -08:00
..
alert CLOUDSTACK-5261: added support for Alert publishing via ROOT Admin API 2013-12-04 10:05:46 -08:00
capacity Broke up some long strings 2013-11-21 07:25:01 -08:00
certificate Reformatted all of the code. 2013-11-21 06:15:26 -08:00
cluster/agentlb Reformatted all of the code. 2013-11-21 06:15:26 -08:00
configuration Reformatted all of the code. 2013-11-21 06:15:26 -08:00
dc Broke up some long strings 2013-11-21 07:25:01 -08:00
domain Reformatted all of the code. 2013-11-21 06:15:26 -08:00
event CLOUDSTACK-5161 enable scaling of a vm using custom offering 2013-11-29 17:53:33 +05:30
host Reformatted all of the code. 2013-11-21 06:15:26 -08:00
hypervisor Reformatted all of the code. 2013-11-21 06:15:26 -08:00
keystore Reformatted all of the code. 2013-11-21 06:15:26 -08:00
network Reformatted all of the code. 2013-11-21 06:15:26 -08:00
offerings Reformatted all of the code. 2013-11-21 06:15:26 -08:00
projects Reformatted all of the code. 2013-11-21 06:15:26 -08:00
secstorage Reformatted all of the code. 2013-11-21 06:15:26 -08:00
service CLOUDSTACK-5161 enable scaling of a vm using custom offering 2013-11-29 17:53:33 +05:30
storage CLOUDSTACK-5161 enable scaling of a vm using custom offering 2013-11-29 17:53:33 +05:30
tags Reformatted all of the code. 2013-11-21 06:15:26 -08:00
upgrade Reformat of source code to set a stable base for the future. I couldn't get checkstyle enabled. There's still about a thousand errors from checkstyle. Most of it from length errors from comments and strings. Will attempt to remove those tonight. This change is so large I just want to get it in before any merge nightmares. The changes are fairly minor though and I did a full compile and start a server with the reformat code. 2013-11-21 07:56:47 -08:00
usage CLOUDSTACK-5161 enable scaling of a vm using custom offering 2013-11-29 17:53:33 +05:30
user Reformatted all of the code. 2013-11-21 06:15:26 -08:00
vm CLOUDSTACK-5206: Ability to control the external id of first 2013-11-26 09:52:17 -08:00