Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							aae1424f35 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6582: fixed network acl cidr issues  
						
						 
						
						... 
						
						
						
						Conflicts:
	setup/db/db/schema-430to440.sql 
						
						
					 
					
						2014-05-06 22:54:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							067e6b4933 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6582: cidr field removed  
						
						 
						
						
						
						
					 
					
						2014-05-06 22:49:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							c9a09f548c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6579: used_bytes column of storage_pool table is no longer used and should be removed  
						
						 
						
						... 
						
						
						
						For now correctly setting used_bytes. Also fixed the corresponding simulator code 
						
						
					 
					
						2014-05-06 20:27:41 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							59bf355919 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6531: stopping the router in case of command failures. Also added alerts for failures.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Jayapal <jayapal@apache.org> 
						
						
					 
					
						2014-05-06 20:08:30 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							40836344de 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6578: Fixed issue in delete remote access vpn command  
						
						 
						
						
						
						
					 
					
						2014-05-06 20:08:30 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							b9b623bccc 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6577: Disable service monitoring in RVR  
						
						 
						
						
						
						
					 
					
						2014-05-06 20:08:30 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							11591582d5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6364 Added ip address validation  
						
						 
						
						... 
						
						
						
						Also updated to assign vm primary ip to lb rule when vmid is passed virtualmachineid
and vm id ip details in vmidipmap 
						
						
					 
					
						2014-05-06 20:08:30 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Bierce 
							
						 
					 
					
						
						
						
						
							
						
						
							59eed9ef77 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6552 Cloudstack-Management install package creates log  
						
						 
						
						... 
						
						
						
						directory that is never used 
						
						
					 
					
						2014-05-06 11:24:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							c2c99dc1f6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6483: UI > Load Balancing > "VM+IP" listing > After removing a "VM+IP" under a LB rule, AddVMs dialog should reflect the change (i.e. show the removed IP in IP dropdown in AddVMs dialog)  
						
						 
						
						
						
						
					 
					
						2014-05-05 13:47:01 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							4d84970ddc 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6342: Fix LB table listing for Firefox  
						
						 
						
						
						
						
					 
					
						2014-05-05 12:32:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dariusz Nejbauer 
							
						 
					 
					
						
						
						
						
							
						
						
							41684505d6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3932: UI: Fix Truncation issue in secondary storage URL  
						
						 
						
						... 
						
						
						
						Signed-off-by: Brian Federle <brian.federle@citrix.com> 
						
						
					 
					
						2014-05-05 12:15:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							db154a0d79 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5976: Typo in "ssh_keypairs" table's foreign key constraints  
						
						 
						
						... 
						
						
						
						on the Upgraded Setup 
						
						
					 
					
						2014-05-05 20:32:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Girish Chaudhari 
							
						 
					 
					
						
						
						
						
							
						
						
							0babb92d62 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2697 Removed the clusterId as null from the alert message logs  
						
						 
						
						... 
						
						
						
						Signed-off-by: Daan Hoogland <daan@onecht.net> 
						
						
					 
					
						2014-05-05 19:10:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tanner Danzey 
							
						 
					 
					
						
						
						
						
							
						
						
							601827e6b3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5907, CLOUDSTACK-6396: KVM/RBD & KVM/CLVM volumes mistakenly shown as OVM, disables snapshotting  
						
						 
						
						... 
						
						
						
						modified:   server/src/com/cloud/api/ApiDBUtils.java
Signed-off-by: Daan Hoogland <daan@onecht.net> 
						
						
					 
					
						2014-05-05 15:15:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							6c44c0661d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6479: Strict and Preferred modes should only be allowed in Implict Dedication Planner Service Offerings.  
						
						 
						
						
						
						
					 
					
						2014-05-05 14:26:44 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajesh Battala 
							
						 
					 
					
						
						
						
						
							
						
						
							cc92f3bbe3 
							
						 
					 
					
						
						
							
							Fixed testSetupGuestNetwork unit test as the SetupGuestnetwork prepare command got changed  
						
						 
						
						
						
						
					 
					
						2014-05-05 13:45:12 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajesh Battala 
							
						 
					 
					
						
						
						
						
							
						
						
							f9cf2c241b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6518 [Hyper-V] Efficient way of finding the empty nic in VR/VpcVR to configure VPC entities  
						
						 
						
						
						
						
					 
					
						2014-05-05 12:56:42 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajesh Battala 
							
						 
					 
					
						
						
						
						
							
						
						
							6cbb9a5b72 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6528 SetupGuestNetwork command is not deleting the guest network configured on the eth device  
						
						 
						
						
						
						
					 
					
						2014-05-05 12:56:42 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							14f1b96b51 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6466: cpu and ram is not getting updated correctly in usage_vm_instance table for usage type 2  
						
						 
						
						
						
						
					 
					
						2014-05-05 11:50:48 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							2284a95e4f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6463: password is not set for VMs created from password enabled template  
						
						 
						
						
						
						
					 
					
						2014-05-05 11:48:35 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							99b4cf788e 
							
						 
					 
					
						
						
							
							Cloudstack-5077: reserve cpu and memory only when vmware.reserve.cpu/mem are set to true. Insted of setting the ovecommit values to one on upgrade, we popultate them from the global values.  
						
						 
						
						... 
						
						
						
						Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
	engine/schema/src/com/cloud/upgrade/dao/Upgrade420to421.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java 
						
						
					 
					
						2014-05-05 11:39:10 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Girish Shilamkar 
							
						 
					 
					
						
						
						
						
							
						
						
							8f1498dc8c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6559: Added listall=True to list vm API  
						
						 
						
						
						
						
					 
					
						2014-05-05 11:13:11 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ynojima 
							
						 
					 
					
						
						
						
						
							
						
						
							4443890c85 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6571 bugfix: 'service cloudstack-agent stop' fails to stop the process started on boot  
						
						 
						
						
						
						
					 
					
						2014-05-04 20:47:20 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sachchidanand Vaidya 
							
						 
					 
					
						
						
						
						
							
						
						
							bd3ec50dea 
							
						 
					 
					
						
						
							
							Added unit tests for Juniper contrail VM Interface Model and Instance Ip Model class  
						
						 
						
						... 
						
						
						
						Signed-off-by: Daan Hoogland <daan@onecht.net> 
						
						
					 
					
						2014-05-04 21:46:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Milamber 
							
						 
					 
					
						
						
						
						
							
						
						
							1080de5d6d 
							
						 
					 
					
						
						
							
							Remove bad backslash near "label.nicira.nvp.details" key.  
						
						 
						
						
						
						
					 
					
						2014-05-04 15:32:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Milamber 
							
						 
					 
					
						
						
						
						
							
						
						
							90245ebe85 
							
						 
					 
					
						
						
							
							Update L10N resource files on master branch (with 4.4 translation strings)  
						
						 
						
						
						
						
					 
					
						2014-05-04 15:26:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							4e674ffad1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6568:API:createVolume: Volume gets created with wrong domain  
						
						 
						
						... 
						
						
						
						ID. 
						
						
					 
					
						2014-05-02 17:47:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							8ac7784db2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6170 Corrected an issue related to the "Reinstall VM" command and managed storage with VMware  
						
						 
						
						
						
						
					 
					
						2014-05-02 18:41:59 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							7f595778ad 
							
						 
					 
					
						
						
							
							Fix compilation error due to cherry-pick CLOUDSTACK-6569.  
						
						 
						
						
						
						
					 
					
						2014-05-02 16:01:13 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							3314e11b70 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6569: IAM - Regular user is able to listNetworks of another  
						
						 
						
						... 
						
						
						
						user in the same domain , by passing account and domainId. 
						
						
					 
					
						2014-05-02 14:58:11 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							15c4851fc9 
							
						 
					 
					
						
						
							
							LOUDSTACK-6475: cleanupVPC task - removed the transaction wrapping up multiple VPC destroy as the destroy operation has external calls, to prevent long-locked transaction.  
						
						 
						
						... 
						
						
						
						Reviewed-by: Prachi Damle 
						
						
					 
					
						2014-05-02 14:20:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Schmit 
							
						 
					 
					
						
						
						
						
							
						
						
							81b4731e3b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6472 listUsageRecords: Pull information from removed items as well, fixing NPEs/Null UUIDs with usage API calls.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Sebastien Goasguen <runseb@gmail.com> 
						
						
					 
					
						2014-05-02 16:27:21 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							178240a7da 
							
						 
					 
					
						
						
							
							test for HighAvailabilityManagerImpl  
						
						 
						
						... 
						
						
						
						Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2014-05-02 21:22:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							726d8fc3fc 
							
						 
					 
					
						
						
							
							test for escapeHTML  
						
						 
						
						... 
						
						
						
						- test added
- StringBuffer replaced with StringBuilder
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2014-05-02 21:19:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							78507c07c8 
							
						 
					 
					
						
						
							
							log exceptions in ConsoleProxyServlet  
						
						 
						
						... 
						
						
						
						- Added exception to the logger method parameters to make stack trace available
- removed checking of debug level, it does not save temporary object creation here
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2014-05-02 21:19:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gaurav Aradhye 
							
						 
					 
					
						
						
						
						
							
						
						
							59d0b75e79 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6257: Adding function to check state of VM  
						
						 
						
						
						
						
					 
					
						2014-05-02 23:12:13 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							9e98cbf1c1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6564: OVS distributed routing: use file based OF rule updates  
						
						 
						
						... 
						
						
						
						use ovs-ofctl replace flows by file name option to update the OF rules
instead of sequenetially configuring the rules. 
						
						
					 
					
						2014-05-02 18:54:30 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sateesh Chodapuneedi 
							
						 
					 
					
						
						
						
						
							
						
						
							5bc72ea250 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6317 [VMware] Tagged VLAN support broken for Management/Control/Storage traffic  
						
						 
						
						... 
						
						
						
						Check if switch name detected from traffic label for management, storage, control traffic is null before falling back to default value.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org> 
						
						
					 
					
						2014-05-02 18:25:29 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							82c082792e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6445: Minor fixes in vm ha test  
						
						 
						
						
						
						
					 
					
						2014-05-02 17:32:07 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							a7004db7c8 
							
						 
					 
					
						
						
							
							rbd: Create snapshot for cloning operations only when it is required  
						
						 
						
						... 
						
						
						
						We used to create the snapshot after the copy from Secondary Storage,
but it could be that we never use the snapshot.
Now we check if the snapshot exists prior to performing the cloning operation 
						
						
					 
					
						2014-05-02 11:55:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ynojima 
							
						 
					 
					
						
						
						
						
							
						
						
							155745e26c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6351 bugfix: Java1.6 is installed instead of Java7  
						
						 
						
						... 
						
						
						
						Since epoch spesicifation doesn't work on RHEL6.3,
"java7" is used in the rpm spec.
Conflicts:
	packaging/centos63/cloud.spec 
						
						
					 
					
						2014-05-02 00:21:24 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							134a7998ce 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6556: Deploy VM failing with error "does  
						
						 
						
						... 
						
						
						
						not have permission to access resource Ntwk". 
						
						
					 
					
						2014-05-01 15:57:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							d7c5382c58 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6535: IAM:MS:API createVMSnapshot doesn't preserve access  
						
						 
						
						... 
						
						
						
						rights. 
						
						
					 
					
						2014-05-01 15:57:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							95e9db2f91 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6556: [Automation] Deploy VM failing with error "does not  
						
						 
						
						... 
						
						
						
						have permission to access resource Ntwk". 
						
						
					 
					
						2014-05-01 15:57:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							09c9f8dfbd 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6443: [Automation] Two Test Cases failed on "test_volumes.py"  
						
						 
						
						... 
						
						
						
						- AttributeError: VirtualMachine instance has no attribute 'hostid'. 
						
						
					 
					
						2014-05-01 15:57:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							1b78a1c87d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6502:Remove trailing whitespaces.  
						
						 
						
						
						
						
					 
					
						2014-05-01 15:57:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							2521fd482b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6513: remove commented code.  
						
						 
						
						
						
						
					 
					
						2014-05-01 15:57:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							db9aee4517 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6513: templateFilter=shared should not show self-owned  
						
						 
						
						... 
						
						
						
						template. 
						
						
					 
					
						2014-05-01 15:57:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							a9072a6612 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6513: Optimize code by removing deprecated utility to  
						
						 
						
						... 
						
						
						
						QueryManagerImpl as private method just used for listTemplates and
listAffinityGroups to avoid misuse by new list APIs. 
						
						
					 
					
						2014-05-01 15:57:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							5521581b6e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6532:Affinity Groups - As admin user, not able to list all  
						
						 
						
						... 
						
						
						
						affinity groups available for regular users by passing account and
domainId paramater. This is to revert IAM way of implementing
listAffinityGroupsCmd, will bring it back when we have implemented real
impersonation. 
						
						
					 
					
						2014-05-01 15:57:27 -07:00