Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							95364a4022 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5531  
						
						 
						
						... 
						
						
						
						Initial support for vhd, raw, vmdk image formats on KVM. Tested all formats with local and CLVM. 
						
						
					 
					
						2013-12-16 14:32:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							fa2f18d2a2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4875. Vmware vCenter 5.5 - System VM deployment fails During VM deployment.  
						
						 
						
						... 
						
						
						
						When base template is being cloned to create VM ROOT disk, get the disk path i.e. base file name
of the VM's ROOT disk from vCenter 
						
						
					 
					
						2013-12-17 18:31:15 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Devdeep Singh 
							
						 
					 
					
						
						
						
						
							
						
						
							3604f87c8d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5217: Attach volume fails with NPE. Made changes to make sure  
						
						 
						
						... 
						
						
						
						the hypervisor product version is reported on startup. Also made changes
to fix attach and detach volume on scsi controller. 
						
						
					 
					
						2013-12-17 16:28:08 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Devdeep Singh 
							
						 
					 
					
						
						
						
						
							
						
						
							759d484d9a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5489: Query the user name and add it to the command while mounting a cifs share.  
						
						 
						
						
						
						
					 
					
						2013-12-17 14:19:32 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							2f53295151 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5521: Create multi-core topology when deploying KVM virtual machines with many cores  
						
						 
						
						
						
						
					 
					
						2013-12-16 16:12:43 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							46d1e1afb2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5446:KVM-Secondary Store down-Even after secondary store is  
						
						 
						
						... 
						
						
						
						brought back up after being down for few hours,snapshot jobs do not get
triggered with reason "there is other active snapshot tasks on the
instance to which the volume is attached". 
						
						
					 
					
						2013-12-13 22:04:29 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							1d5051f60e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5435 enabled encryption for ldap params  
						
						 
						
						
						
						
					 
					
						2013-12-13 17:44:24 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Devdeep Singh 
							
						 
					 
					
						
						
						
						
							
						
						
							86dadaaec4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5489: Cloud user doesn't have permissions to copy systemvm.iso to secondary.  
						
						 
						
						... 
						
						
						
						Make sure when a cifs (secondary) is mounted, uid is set for the user who owns the files
and directories on the filesystem. 
						
						
					 
					
						2013-12-13 17:32:34 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Devdeep Singh 
							
						 
					 
					
						
						
						
						
							
						
						
							db2b8d9b0d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5311: Fix the host version reported by the hyper-v agent. Also updated the hypervisor  
						
						 
						
						... 
						
						
						
						capabilities for hyper-v. 
						
						
					 
					
						2013-12-13 10:28:17 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							be5e5cc641 
							
						 
					 
					
						
						
							
							All Checkstyle problems corrected  
						
						 
						
						
						
						
					 
					
						2013-12-12 12:26:07 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							f33b247fc3 
							
						 
					 
					
						
						
							
							Moved the checkstyle project from parents to build to store all build tools in one location.  Modified the config file to use 1024 for now.  
						
						 
						
						
						
						
					 
					
						2013-12-12 12:23:49 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Donal Lafferty 
							
						 
					 
					
						
						
						
						
							
						
						
							ffd1a078d4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5462: Hyperv agent confused by existing volume of different  
						
						 
						
						... 
						
						
						
						image type. Works by avoiding volume image format inference errors and
removing existing files with same name, but different format. 
						
						
					 
					
						2013-12-12 14:56:37 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Devdeep Singh 
							
						 
					 
					
						
						
						
						
							
						
						
							bdbc5f2ae3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5473: Fixed the name with which the hyper-v agent gets  
						
						 
						
						... 
						
						
						
						installed as a service. 
						
						
					 
					
						2013-12-12 14:56:29 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Devdeep Singh 
							
						 
					 
					
						
						
						
						
							
						
						
							78b39bbe12 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5455: Fix detach iso on hyperv. Made sure normalized path is  
						
						 
						
						... 
						
						
						
						used while attaching and detaching iso. Also made normalization of path
across the agent code. 
						
						
					 
					
						2013-12-11 19:42:36 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Devdeep Singh 
							
						 
					 
					
						
						
						
						
							
						
						
							2b1d997728 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5248: Fixed creation of mount point when running as non root (cloud) user.  
						
						 
						
						... 
						
						
						
						The systemvm iso file is copied only when a systemvm or router vm is to be started on
a host. The file gets copied to the secondary storage. The mount point used is the one
that has permissions for regular user to mount a share.
CLOUDSTACK-5275: The failure was because a secondary storage wasn't available when the
host was added. When a setup is done through wizard the hosts get added before the
secondary storage. CS was tying to copy yhe systemvm iso to secondary and it used to
fail if it wasn't available. Made a change to copy the iso only when a systemvm is
being started on a host.
CLOUDSTACK-5202: Made changes to clean up mount points on stop and start.
All the three are related fixes; so putting a fix in one commit. 
						
						
					 
					
						2013-12-11 17:50:13 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							db8f83d71b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5375 :ldapconfig and ldapRemove api's are not working Added support for 4.2 ldap apis  
						
						 
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2013-12-11 15:30:03 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							36cbc2dfbf 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4498 we should not reserve memory and cpu for vmware VMs if the  
						
						 
						
						... 
						
						
						
						vmware.reserve.cpu and vmware.reserve.mem are set to false while not overcommiting
Signed-off-by: Jayapal <jayapal@apache.org> 
						
						
					 
					
						2013-12-11 13:07:56 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							1ddc0b99fe 
							
						 
					 
					
						
						
							
							put CS/XS plugin log into seperate directory  
						
						 
						
						
						
						
					 
					
						2013-12-10 01:23:46 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							5c12250dea 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5278 Fixed cleaning up egress default rules on VR and SRX  
						
						 
						
						... 
						
						
						
						1. Egress default policy rules is send to the firewall provider. It is up to the
    provider to configure the rules.
   2. The default policy rules are send for both allow and deny default policy.
   3. On network shutdown rules for delete are send.
   4. For VR and SRX, by default deny the traffic. So no default rule to deny traffic is required. 
						
						
					 
					
						2013-12-10 14:19:03 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tuna 
							
						 
					 
					
						
						
						
						
							
						
						
							dc151115be 
							
						 
					 
					
						
						
							
							AutoScaling without NetScaler  
						
						 
						
						
						
						
					 
					
						2013-12-10 10:35:55 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Will Stevens 
							
						 
					 
					
						
						
						
						
							
						
						
							c60a256ebd 
							
						 
					 
					
						
						
							
							fixed egress rules for palo alto plugin and cleaned up extra api calls on master  
						
						 
						
						... 
						
						
						
						Signed-off-by: Sheng Yang <sheng.yang@citrix.com> 
						
						
					 
					
						2013-12-09 18:26:57 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tuna 
							
						 
					 
					
						
						
						
						
							
						
						
							4de09ee654 
							
						 
					 
					
						
						
							
							add Apache Licensed  
						
						 
						
						
						
						
					 
					
						2013-12-10 08:37:37 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							be67f5d17a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5428: support NetScaler to be configured exclusively for GSLB  
						
						 
						
						... 
						
						
						
						service and not used for LB
Fix adds a boolean flag to addNetscalerLoadBalancer api, which
will mark added NetScaler for exclusive GSLB service. A netscaler marked
as exclusive gslb service provider is not picked for any guest network's
lb provider. 
						
						
					 
					
						2013-12-10 06:20:58 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tuna 
							
						 
					 
					
						
						
						
						
							
						
						
							267ff79bfb 
							
						 
					 
					
						
						
							
							post-rebasing  
						
						 
						
						
						
						
					 
					
						2013-12-09 23:33:15 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tuna 
							
						 
					 
					
						
						
						
						
							
						
						
							61e80f030a 
							
						 
					 
					
						
						
							
							remove unused code  
						
						 
						
						
						
						
					 
					
						2013-12-09 23:33:15 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tuna 
							
						 
					 
					
						
						
						
						
							
						
						
							7efab20300 
							
						 
					 
					
						
						
							
							fix staticNat after rebase  
						
						 
						
						
						
						
					 
					
						2013-12-09 23:33:15 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tuna 
							
						 
					 
					
						
						
						
						
							
						
						
							4d0602175c 
							
						 
					 
					
						
						
							
							refactor ovsProvider to new resource  
						
						 
						
						
						
						
					 
					
						2013-12-09 23:33:15 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tuna 
							
						 
					 
					
						
						
						
						
							
						
						
							0624fe5d03 
							
						 
					 
					
						
						
							
							remove unused table: ovs_nic_map  
						
						 
						
						
						
						
					 
					
						2013-12-09 23:33:15 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tuna 
							
						 
					 
					
						
						
						
						
							
						
						
							c7dab82dc4 
							
						 
					 
					
						
						
							
							move cloudstack_pluginlib  
						
						 
						
						
						
						
					 
					
						2013-12-09 23:33:15 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tuna 
							
						 
					 
					
						
						
						
						
							
						
						
							015ab6af8a 
							
						 
					 
					
						
						
							
							fix rebase master  
						
						 
						
						
						
						
					 
					
						2013-12-09 23:33:14 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tuna 
							
						 
					 
					
						
						
						
						
							
						
						
							9f82757eb9 
							
						 
					 
					
						
						
							
							tuna  
						
						 
						
						
						
						
					 
					
						2013-12-09 23:33:14 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tuna 
							
						 
					 
					
						
						
						
						
							
						
						
							3df8b912fc 
							
						 
					 
					
						
						
							
							add kvm support & LB service  
						
						 
						
						
						
						
					 
					
						2013-12-09 23:33:14 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tuna 
							
						 
					 
					
						
						
						
						
							
						
						
							9c702ff388 
							
						 
					 
					
						
						
							
							tuna add port forwarding support  
						
						 
						
						
						
						
					 
					
						2013-12-09 23:33:14 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tuna 
							
						 
					 
					
						
						
						
						
							
						
						
							d935d3865a 
							
						 
					 
					
						
						
							
							tuna  
						
						 
						
						
						
						
					 
					
						2013-12-09 23:33:14 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tuna 
							
						 
					 
					
						
						
						
						
							
						
						
							4e914b7087 
							
						 
					 
					
						
						
							
							re-factor gre controller  
						
						 
						
						... 
						
						
						
						Signed-off-by: tuna <ng.tuna@gmail.com> 
						
						
					 
					
						2013-12-09 23:33:14 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tuna 
							
						 
					 
					
						
						
						
						
							
						
						
							96188a3730 
							
						 
					 
					
						
						
							
							re-factor gre controller prototype  
						
						 
						
						
						
						
					 
					
						2013-12-09 23:33:14 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tuna 
							
						 
					 
					
						
						
						
						
							
						
						
							12a4d30007 
							
						 
					 
					
						
						
							
							add two tables for gre controller  
						
						 
						
						
						
						
					 
					
						2013-12-09 23:33:14 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tuna 
							
						 
					 
					
						
						
						
						
							
						
						
							3a9c9bd717 
							
						 
					 
					
						
						
							
							fix white-space  
						
						 
						
						
						
						
					 
					
						2013-12-09 23:33:14 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tuna 
							
						 
					 
					
						
						
						
						
							
						
						
							79a7ce871e 
							
						 
					 
					
						
						
							
							make SDN GRE work with XCP 1.6  
						
						 
						
						
						
						
					 
					
						2013-12-09 23:33:14 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							088247b61b 
							
						 
					 
					
						
						
							
							kvm: Force the default disk cache mode to none.  
						
						 
						
						... 
						
						
						
						Not doing this caused the cache mode to be null for SystemVMs for their CDROM/ISO. 
						
						
					 
					
						2013-12-09 16:49:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anshul Gangwar 
							
						 
					 
					
						
						
						
						
							
						
						
							1f67ebc297 
							
						 
					 
					
						
						
							
							Fix nuget package path error.  
						
						 
						
						
						
						
					 
					
						2013-12-09 13:23:20 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anshul Gangwar 
							
						 
					 
					
						
						
						
						
							
						
						
							462e6d91c1 
							
						 
					 
					
						
						
							
							Fix the directory path of where the nuget packages get downloaded.  
						
						 
						
						
						
						
					 
					
						2013-12-09 11:10:51 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							e6127a7c00 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5216. delete volume failed due to Exception: java.lang.Exception" while destroying Vms  
						
						 
						
						
						
						
					 
					
						2013-12-06 12:04:02 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Syed Ahmed 
							
						 
					 
					
						
						
						
						
							
						
						
							ee7380ace2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5296: Add certificate chain support for netscaler  
						
						 
						
						... 
						
						
						
						This patch adds support for trust chains in the netscaler.
I initially planned on using the 10.1 API's "bundle" feature but during
my testing I found that was not working. So I am doing the chain linking
myself. Also NS can have only one entity of a certificate ie lets say
two different users try to add the same certificate on the netscaler
only one of them will go through. The other one says resouce already
exists even though they have different files.
This can be a problem in trust chains where the chain can be shared
between multiple accounts/certificates. So, I am using the figerprint as
an identifier of a certificate and making sure that we delete it only
when no one references it. 
						
						
					 
					
						2013-12-05 15:35:28 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							04b48ae04e 
							
						 
					 
					
						
						
							
							XS VMmetadata platform contains virtual platform related info, CS should save platform info in DB to migrate the VM to other Cluster  
						
						 
						
						
						
						
					 
					
						2013-12-05 01:41:14 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajesh Battala 
							
						 
					 
					
						
						
						
						
							
						
						
							0b16a45ceb 
							
						 
					 
					
						
						
							
							Modified savepassword.sh path in Hyperv Resource according to the new template  
						
						 
						
						
						
						
					 
					
						2013-12-05 11:45:54 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							fd195433ae 
							
						 
					 
					
						
						
							
							fixing the test  
						
						 
						
						
						
						
					 
					
						2013-12-04 16:14:27 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							71323f15c6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5352:  
						
						 
						
						... 
						
						
						
						CPU cap calculated incorrectly for VMs on XenServer hosts. It should not be limited by the overprovisioning and should set the cap as service offering 
						
						
					 
					
						2013-12-04 14:59:24 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							71d547ba87 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5352:  
						
						 
						
						... 
						
						
						
						CPU cap calculated incorrectly for VMs on XenServer hosts. It should not be limited by the overprovisioning and should set the cap as service offering 
						
						
					 
					
						2013-12-04 14:53:28 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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