Anshul Gangwar 
							
						 
					 
					
						
						
						
						
							
						
						
							3996b402aa 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7620: Added SNMP MIB file for snmp-alerts plugin  
						
						 
						
						
						
						
					 
					
						2014-11-17 15:11:31 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Milamber 
							
						 
					 
					
						
						
						
						
							
						
						
							317606859b 
							
						 
					 
					
						
						
							
							Update L10N resource files on master branch with 4.5 translation strings  
						
						 
						
						
						
						
					 
					
						2014-11-15 08:48:44 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Milamber 
							
						 
					 
					
						
						
						
						
							
						
						
							430ae6859c 
							
						 
					 
					
						
						
							
							Add 4.5.x messages.properties to Transifex config tool  
						
						 
						
						
						
						
					 
					
						2014-11-15 08:43:51 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							5213401ace 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7920: NPE in the payload was causing the ssvm agent to not connect, fix it and also make sure that template/volume sync are robust that exceptions do not cause ssvm agent disconnect issues.  
						
						 
						
						
						
						
					 
					
						2014-11-14 16:19:10 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							39a671dfd8 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7919: If there is an out of band movement for the VR, irrespective of the fact that came as out of band live migrate or HA, reboot the router to make sure the router has all the rules configured.  
						
						 
						
						
						
						
					 
					
						2014-11-14 14:30:46 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							2d4e87973d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7773: UI > Infrastructure > SystemVMs, Routers > Change Service Offering > service offerings dropdown > populate only service offerings that the VM is allowed to change to. i.e. exclude service offerings that the VM is not allowed to change to.  
						
						 
						
						
						
						
					 
					
						2014-11-14 13:58:35 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							e87bb20d0c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7916: Generate Alerts if System VMs cannot be started.  
						
						 
						
						
						
						
					 
					
						2014-11-14 13:35:40 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							3907bc6f9d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7916: Generate Alerts if System VMs cannot be started.  
						
						 
						
						
						
						
					 
					
						2014-11-14 13:18:27 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mihaela Stoica 
							
						 
					 
					
						
						
						
						
							
						
						
							a49e240958 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7645: Use the localization function _l() instead of dictionary directly  
						
						 
						
						
						
						
					 
					
						2014-11-14 11:51:40 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							fd03091c81 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-7821: Fix OSX cannot connect to VPN due to wrongly declaim ENCAPSULATION_MODE_UDP_TRANSPORT_RFC"  
						
						 
						
						... 
						
						
						
						This reverts commit e1c788ca3c69a8c8c2041c7b106f76fa49332888.
This breaks Windows 7 client. 
						
						
					 
					
						2014-11-14 11:44:53 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							62a7a02f70 
							
						 
					 
					
						
						
							
							guest os name changes from 'SUSE Linux Enterprise Server 12 (experimental)' to 'SUSE Linux Enterprise Server 12 (64-bit)' in XS 5.6 beta 3  
						
						 
						
						
						
						
					 
					
						2014-11-14 11:26:03 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								vetrivelc 
							
						 
					 
					
						
						
						
						
							
						
						
							bdcaaca40e 
							
						 
					 
					
						
						
							
							Updated transaltions to JA & SC Files  
						
						 
						
						... 
						
						
						
						Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com> 
						
						
					 
					
						2014-11-14 08:09:35 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SrikanteswaraRao Talluri 
							
						 
					 
					
						
						
						
						
							
						
						
							44663a868b 
							
						 
					 
					
						
						
							
							Merge branch '4.5'  
						
						 
						
						... 
						
						
						
						* 4.5:
  CLOUDSTACK-7355 - test_netscaler_configs.py uses hardcoded NetScaler credentials 
						
						
					 
					
						2014-11-14 16:58:31 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Doug Clark 
							
						 
					 
					
						
						
						
						
							
						
						
							3609f60447 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7355 - test_netscaler_configs.py uses hardcoded NetScaler credentials  
						
						 
						
						... 
						
						
						
						Refactored code to use test_data instead of hardcoded NetScaler credentials
Refactored code to remove large scale duplication
Fixed some minor logic error in the existing tests
This patch has not added or removed any of the original test-cases.
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org> 
						
						
					 
					
						2014-11-14 16:56:59 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SrikanteswaraRao Talluri 
							
						 
					 
					
						
						
						
						
							
						
						
							0fd5475593 
							
						 
					 
					
						
						
							
							Merge branch '4.5'  
						
						 
						
						... 
						
						
						
						* 4.5:
  CLOUDSTACK-7885 : Fixed the script '/maint/test_vpc_host_maintenance.py'
  CLOUDSTACK-7860: test_eip_elb.py - Move Netscler info out of the test case. Read it from config. Fix attribute error. Fix pep8 issues. Fix imports. 
						
						
					 
					
						2014-11-14 16:49:51 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chandan Purushothama 
							
						 
					 
					
						
						
						
						
							
						
						
							f92fa4257a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7885 : Fixed the script '/maint/test_vpc_host_maintenance.py'  
						
						 
						
						... 
						
						
						
						Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org> 
						
						
					 
					
						2014-11-14 16:46:37 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gaurav Aradhye 
							
						 
					 
					
						
						
						
						
							
						
						
							2bfddc55b8 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7860: test_eip_elb.py - Move Netscler info out of the test case. Read it from config. Fix attribute error. Fix pep8 issues. Fix imports.  
						
						 
						
						... 
						
						
						
						Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org> 
						
						
					 
					
						2014-11-14 16:39:55 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Devdeep Singh 
							
						 
					 
					
						
						
						
						
							
						
						
							a60b729d0a 
							
						 
					 
					
						
						
							
							Merge branch '4.5'  
						
						 
						
						
						
						
					 
					
						2014-11-14 14:14:26 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Devdeep Singh 
							
						 
					 
					
						
						
						
						
							
						
						
							a782495c68 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7642. Class not found exception after upgrading from 4.3 to 4.5 on a  
						
						 
						
						... 
						
						
						
						XenServer hypervisor setup. The resource path has changed for xenserver resources
in 4.5. On an upgraded setup the db entries in host table for the resource path
needs to be updated. Made a fix in the upgrade script. 
						
						
					 
					
						2014-11-14 14:10:36 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							7fd1e8e239 
							
						 
					 
					
						
						
							
							Merge branch '4.5'  
						
						 
						
						
						
						
					 
					
						2014-11-14 12:12:07 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Devdeep Singh 
							
						 
					 
					
						
						
						
						
							
						
						
							cfe5a6fcbf 
							
						 
					 
					
						
						
							
							While adding secondary storage / is not added to secondary storage cifs url.  
						
						 
						
						... 
						
						
						
						This causes it to fail if that path doesn't begin with '/'. It works fine
while adding primary storage. Added a check to add '/' in begining if needed. 
						
						
					 
					
						2014-11-14 11:20:25 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Devdeep Singh 
							
						 
					 
					
						
						
						
						
							
						
						
							cffae8eef0 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6924. To attach a volume if a volume needs to be moved to another storage  
						
						 
						
						... 
						
						
						
						pool, the source and destination pools cannot be local and cluster/zone and vice versa.
Cloudstack detects it and throws a exception. However, the end user only sees an
unexpected exception and not the reason for failure. Fixed it by making sure the
reason for the failure is correctly captured and shown to the end user. 
						
						
					 
					
						2014-11-14 11:19:19 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Damodar 
							
						 
					 
					
						
						
						
						
							
						
						
							7e6ec2ce82 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7877: The NET.IPRELEASE events are not added to usage_event on IP range deletion from Physical Networks.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Jayapal <jayapal@apache.org> 
						
						
					 
					
						2014-11-14 10:31:46 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							e92f429463 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7910: UI > Instance Wizard > declare serviceOfferingObjs before using it.  
						
						 
						
						
						
						
					 
					
						2014-11-13 16:26:09 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							03505901bc 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7910: UI > Instance Wizard > declare serviceOfferingObjs before using it.  
						
						 
						
						
						
						
					 
					
						2014-11-13 16:24:41 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							9717bbdc51 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7645: UI: Fix dictionary JSP include order  
						
						 
						
						... 
						
						
						
						-Places dictionary JSP includes at top of script includes, to help solve
a potential issue where the dictionary may not always be loaded before
the UI initializes 
						
						
					 
					
						2014-11-13 15:41:02 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							2ee3d4258e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7645: UI: Fix dictionary JSP include order  
						
						 
						
						... 
						
						
						
						-Places dictionary JSP includes at top of script includes, to help solve
a potential issue where the dictionary may not always be loaded before
the UI initializes 
						
						
					 
					
						2014-11-13 15:25:12 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							8ec26fb531 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7645: UI: Fix method for extending dictionary  
						
						 
						
						... 
						
						
						
						Instead of mapping both dictionary JSP files to separate objects, extend
dictionary2's object onto single 'dictionary' object.
-- The previous approach was causing issues on certain dialogs, which were not
opening due to possible missing labels.
Conflicts:
	ui/dictionary2.jsp 
						
						
					 
					
						2014-11-13 15:20:17 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							ade305be20 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7909: Change the capacity_state in op_host_Capacity table only on explicit enabling/disabling of the host and remove the logic for changing it when cluster/pod/zone is enabled/disabled. Also add the logic in capacity checker thread so that previous  changes finally get consistent with this new model and also its good to have it for sanity reasons.  
						
						 
						
						
						
						
					 
					
						2014-11-13 13:54:45 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Will Stevens 
							
						 
					 
					
						
						
						
						
							
						
						
							92d4a41a69 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7822: Fixed SSL Cert Tests and relaxed chain validation  
						
						 
						
						
						
						
					 
					
						2014-11-13 09:55:49 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							057ba164f6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7905: Add OEL 6.5 32/64 bit guest os support.  
						
						 
						
						
						
						
					 
					
						2014-11-13 19:19:02 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							7f2219bcbb 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7904: EN-UK: CentOS 6.5 GUI: Key translation fails for some  EN- UK keyboard keys.  
						
						 
						
						
						
						
					 
					
						2014-11-13 19:16:02 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SrikanteswaraRao Talluri 
							
						 
					 
					
						
						
						
						
							
						
						
							63ff683b89 
							
						 
					 
					
						
						
							
							Merge branch '4.5'  
						
						 
						
						
						
						
					 
					
						2014-11-13 18:30:12 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gaurav Aradhye 
							
						 
					 
					
						
						
						
						
							
						
						
							b3faab6f42 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7693: test_scale_vm.py - fix pep8 issues  
						
						 
						
						... 
						
						
						
						CLOUDSTACK-7878: Skip scale VM operation on vmware if vmware tools are not installed
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org> 
						
						
					 
					
						2014-11-13 18:28:13 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gaurav Aradhye 
							
						 
					 
					
						
						
						
						
							
						
						
							46d9f8c6f5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7879: Skip dynamic scaling on vmware if vmware-tools are not installed  
						
						 
						
						... 
						
						
						
						Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org> 
						
						
					 
					
						2014-11-13 18:27:48 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SrikanteswaraRao Talluri 
							
						 
					 
					
						
						
						
						
							
						
						
							4bfb7f20c1 
							
						 
					 
					
						
						
							
							merging 2c08e30a493cb520eb478795bbc5d5d4935dd59b from 4.5  
						
						 
						
						... 
						
						
						
						Merge branch '4.5' 
						
						
					 
					
						2014-11-13 18:11:49 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chandan Purushothama 
							
						 
					 
					
						
						
						
						
							
						
						
							2c08e30a49 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7894 : Fixed the script test_vm_passwdenabled.py - Test Cases failing on Simulator as Testcases try to ssh to the VMs  
						
						 
						
						... 
						
						
						
						Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org> 
						
						
					 
					
						2014-11-13 18:10:44 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SrikanteswaraRao Talluri 
							
						 
					 
					
						
						
						
						
							
						
						
							fa4cc856aa 
							
						 
					 
					
						
						
							
							bringing in bcf328833a84f1d490a774edb63af3e301cf0f5a from 4.5  
						
						 
						
						... 
						
						
						
						Merge branch '4.5' 
						
						
					 
					
						2014-11-13 17:58:56 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chandan Purushothama 
							
						 
					 
					
						
						
						
						
							
						
						
							bcf328833a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7895 : Fixed the script test_security_groups.py - Test Cases failing on Simulator as Testcases try to ssh to the VMs  
						
						 
						
						... 
						
						
						
						Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org> 
						
						
					 
					
						2014-11-13 17:56:20 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chandan Purushothama 
							
						 
					 
					
						
						
						
						
							
						
						
							a02864ab8b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7897 : Fixed the script test_reset_ssh_keypair.py - Test Cases failing on Simulator as Testcases try to ssh to the VMs  
						
						 
						
						... 
						
						
						
						Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org> 
						
						
					 
					
						2014-11-13 17:50:14 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chandan Purushothama 
							
						 
					 
					
						
						
						
						
							
						
						
							765443e7d5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7897 : Fixed the script test_reset_ssh_keypair.py - Test Cases failing on Simulator as Testcases try to ssh to the VMs  
						
						 
						
						... 
						
						
						
						Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org> 
						
						
					 
					
						2014-11-13 17:49:22 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							5107472a01 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6892: use lowercase noredist, as package.sh lowercases build type  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit a18d067278f6b58914dc6a5d44b775ada6cf073e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2014-11-13 17:48:56 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							a18d067278 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6892: use lowercase noredist, as package.sh lowercases build type  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2014-11-13 17:48:11 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							ef6ec7b276 
							
						 
					 
					
						
						
							
							Fixed few coverity issues like invalid boxing unboxing issues, resource leaks, null dereferences  
						
						 
						
						
						
						
					 
					
						2014-11-13 17:26:24 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Saksham Srivastava 
							
						 
					 
					
						
						
						
						
							
						
						
							fc4dceaa99 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7582: Update Storage Pool API does not update tags correctly  
						
						 
						
						
						
						
					 
					
						2014-11-13 17:01:06 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							890f9eeb57 
							
						 
					 
					
						
						
							
							Merge branch '4.5'  
						
						 
						
						
						
						
					 
					
						2014-11-13 16:26:15 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							f585dd2661 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7902: Account creation results in exception in logs  
						
						 
						
						... 
						
						
						
						Event publish code was wrapped in transaction, moved it out 
						
						
					 
					
						2014-11-13 16:11:53 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phillip Kent 
							
						 
					 
					
						
						
						
						
							
						
						
							d2c087aef2 
							
						 
					 
					
						
						
							
							Update ListInternalLBVMsCmd.java  
						
						 
						
						... 
						
						
						
						Fix typo in response name string: there was an extra 's'
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
This closes  #8  
						
						
					 
					
						2014-11-13 16:04:27 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							8c9093b1df 
							
						 
					 
					
						
						
							
							Merge branch '4.5'  
						
						 
						
						... 
						
						
						
						Conflicts:
	framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
	plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java
	setup/db/db/schema-441to450.sql
	test/integration/component/test_escalations_instances.py
	ui/dictionary2.jsp
	ui/scripts/cloudStack.js
This closes  #38  
						
						
					 
					
						2014-11-13 14:53:05 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							03e63a67e0 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7902: Account creation results in exception in logs  
						
						 
						
						... 
						
						
						
						Event publish code was wrapped in transaction, moved it out 
						
						
					 
					
						2014-11-13 14:41:33 +05:30