Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							929fbabaa2 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac.  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-17 14:37:08 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							da8ee45a24 
							
						 
					 
					
						
						
							
							Why is the easy solution always to hard  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-16 17:27:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							95a92ad2e3 
							
						 
					 
					
						
						
							
							Fix typo in convert call  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-16 16:41:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							5d24843ef5 
							
						 
					 
					
						
						
							
							Proper cleanup before the next build of the systemvm  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-16 16:03:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							bf26efc551 
							
						 
					 
					
						
						
							
							Little hack until we can install xsltproc on the buildslave  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-16 15:33:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							794d47c5f2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5883 Convert ovf file to proper format for ESXi  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-16 14:43:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							98e529af41 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5883 Improve error handling to get the real error  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-16 14:43:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anshul Gangwar 
							
						 
					 
					
						
						
						
						
							
						
						
							823abe6a23 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5880: Communication between management server and hyper-v agent should be secure.  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-16 14:48:28 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							fcd21eb7f3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5747 Fixed network restart issue with SRX  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-16 11:29:03 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							a41c9b9631 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5867 Fixed service monitor command path  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-16 11:29:03 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							dd50210e74 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5877: ListTemplates does not sort based on sort_key.  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-15 17:39:00 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sateesh Chodapuneedi 
							
						 
					 
					
						
						
						
						
							
						
						
							6d9146bf2d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5408 [Automation] Failed to deploy vm in vmware environment with error "due to java.io.IOException: Cannot run program "mount": java.io.IOException: error=12, Cannot allocate memory"  
						
						 
						
						... 
						
						
						
						Bump up RAM size of system offering for SSVM to 512MB. Fix if default service offering is already not present.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org> 
						
						
							
						
					 
					
						2014-01-16 01:30:06 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							14e399410b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5696: fix a regression caused by out-of-band sync changes  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-15 16:22:27 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Victor Rodionov 
							
						 
					 
					
						
						
						
						
							
						
						
							753b563947 
							
						 
					 
					
						
						
							
							NexentaStor iSCSI volume driver  
						
						 
						
						... 
						
						
						
						This a NexentaStor iSCSI volume driver.
Now implemented only following functions:
  * create volume
  * delete volume
Currently delete volume still in progress.
Signed-off-by: Edison Su <sudison@gmail.com> 
						
						
							
						
					 
					
						2014-01-15 15:12:48 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sbalineni 
							
						 
					 
					
						
						
						
						
							
						
						
							cc2b1c4961 
							
						 
					 
					
						
						
							
							Contrail plugin fixes -master branch, single commit, no transaction wrappers  
						
						 
						
						... 
						
						
						
						Signed-off-by: Sheng Yang <sheng.yang@citrix.com> 
						
						
							
						
					 
					
						2014-01-15 14:11:49 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							7164fc6e73 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5696: Fix sync issue with out-of-band changes  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-15 13:11:02 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							9aaea28d0d 
							
						 
					 
					
						
						
							
							Fix typo  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-15 15:20:48 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							2a93464431 
							
						 
					 
					
						
						
							
							Fix ids in the awsapi and xapi poms so checkstyle is properly excluded  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-15 13:07:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							3a3d8f27dd 
							
						 
					 
					
						
						
							
							Fix for CLOUDSTACK-5864  
						
						 
						
						... 
						
						
						
						Fixed the mentioned issue.
Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com> 
						
						
							
						
					 
					
						2014-01-15 11:45:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							25ae91da10 
							
						 
					 
					
						
						
							
							Shave another few seconds of the build time by disabling the checkstyle run in the main pom.  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-15 09:49:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							b725035b22 
							
						 
					 
					
						
						
							
							Fix NPE about accessType in RoleBasedApiAccessChecker.start.  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-14 18:20:32 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								root 
							
						 
					 
					
						
						
						
						
							
						
						
							59a46ea953 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://git-wip-us.apache.org/repos/asf/cloudstack  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-15 08:49:18 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								root 
							
						 
					 
					
						
						
						
						
							
						
						
							eca1e97b9b 
							
						 
					 
					
						
						
							
							remove vhd-util from d935d3865aa2a4fb39709f6943f02f9f5a422aff  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-15 08:36:55 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							cc66d03f81 
							
						 
					 
					
						
						
							
							IAMService does not need CallingContext information  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-14 16:34:47 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							6c1849f4bf 
							
						 
					 
					
						
						
							
							Fix Spring wiring issues in starting up MS.  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-14 16:20:30 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							6583cb3800 
							
						 
					 
					
						
						
							
							Add listAclGroupsByAccount to QuerySelector adapters and remove  
						
						 
						
						... 
						
						
						
						AclProxyService interface. 
						
						
							
						
					 
					
						2014-01-14 16:19:25 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							ab4294666e 
							
						 
					 
					
						
						
							
							List view: tests for field rendering  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-14 14:44:07 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sachchidanand Vaidya 
							
						 
					 
					
						
						
						
						
							
						
						
							0bff705621 
							
						 
					 
					
						
						
							
							Add L3VPN isolation method for contrail plugin  
						
						 
						
						... 
						
						
						
						Signed-off-by: Sheng Yang <sheng.yang@citrix.com> 
						
						
							
						
					 
					
						2014-01-14 13:55:35 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							3ed605dc90 
							
						 
					 
					
						
						
							
							Add basic list view test  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-14 13:38:05 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							68b8891c62 
							
						 
					 
					
						
						
							
							Removed all reminants of the IdentityService.  Created the KeysManager to move the management  
						
						 
						
						... 
						
						
						
						of keys out of management server 
						
						
							
						
					 
					
						2014-01-14 13:11:35 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							2893120f2a 
							
						 
					 
					
						
						
							
							Remove old/obsolete UI qunit tests  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-14 12:56:52 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sateesh Chodapuneedi 
							
						 
					 
					
						
						
						
						
							
						
						
							ba96c8cadf 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5408 [Automation] Failed to deploy vm in vmware environment with error "due to java.io.IOException: Cannot run program "mount": java.io.IOException: error=12, Cannot allocate memory"  
						
						 
						
						... 
						
						
						
						Bump up RAM size of system offering for SSVM to 512MB
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org> 
						
						
							
						
					 
					
						2014-01-15 01:45:12 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							4215d69753 
							
						 
					 
					
						
						
							
							Instances UI: Don't show 'view host' link if VM is stopped  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-14 11:09:09 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							6282e8e9ca 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5557: UI > Network > VPC > Router > Public IP Address > fix a bug that Configuration tab was wrongly hidden.  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-14 10:56:06 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Devdeep Singh 
							
						 
					 
					
						
						
						
						
							
						
						
							f58d77c8d1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5689: System vm creation on local storage fails for hyper-v. A  
						
						 
						
						... 
						
						
						
						null pointer exception was getting generated when a VolumeTO object was
serialized to create an answer object. If a local storage is used the uri
field will be null. Added null checks for the same. 
						
						
							
						
					 
					
						2014-01-14 19:55:00 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							f8681de07c 
							
						 
					 
					
						
						
							
							Invalid reference to a class which has been moved  
						
						 
						
						... 
						
						
						
						Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com> 
						
						
							
						
					 
					
						2014-01-14 15:13:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ashutosh K 
							
						 
					 
					
						
						
						
						
							
						
						
							c108d7f0d0 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2237: Automation-Adding next set of test cases for feature - SG in advanced zone  
						
						 
						
						
						
						
							
  ovm3
 
						
					 
					
						2014-01-14 14:34:21 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							16d36dd75f 
							
						 
					 
					
						
						
							
							Fix checkstyle  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-14 14:04:57 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							b61f0a74ca 
							
						 
					 
					
						
						
							
							Centralize all eclipse m2e excludes in the main pom.xml  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-14 09:39:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							e5512960af 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5865. Unable to use login API if domainId parameter is id and not uuid  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-14 13:47:27 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							fac9f2da0f 
							
						 
					 
					
						
						
							
							Adding messageBus events for adding and removal of an account.  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-13 22:12:39 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							bae498c89e 
							
						 
					 
					
						
						
							
							Handle search of those entities without db view created using new ACL  
						
						 
						
						... 
						
						
						
						model. 
						
						
							
						
					 
					
						2014-01-13 21:55:56 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Girish Shilamkar 
							
						 
					 
					
						
						
						
						
							
						
						
							842b58d6ee 
							
						 
					 
					
						
						
							
							CLOUDTACK-5626: Made few changes to test_vpc_vm_life_cycle.py  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-14 11:19:22 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							a957d52a3c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5707. Hitting multiple 'User unauthenticated' exceptions when vCenter is upgraded to 5.5 from 5.1.  
						
						 
						
						... 
						
						
						
						We hit these excptions whenever a management server held session that was with the old 5.1 vCenter server
is used to make resource calls to the new 5.5 vCenter.
Validate a vCenter session context before it is being used to make a resource call.
And if the context is invalid then discard the context and retrieve a new one.
During the invalidation of an old context handle the context disconnect better
by catching the appropriate exception and returning a newly created context.
Conflicts:
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
	plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java
	vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java 
						
						
							
						
					 
					
						2014-01-14 09:38:50 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							af657b3d71 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5861: networks that failed to implement can not be destroyed  
						
						 
						
						... 
						
						
						
						introduces a force option in delete network to forcifully delete a
network. This comes handy in rare cases where network fails to implenet
and network is in shutdown state, but network shutdown to rollback
implement process fails as well.
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
	server/src/com/cloud/user/DomainManagerImpl.java 
						
						
							
						
					 
					
						2014-01-13 23:28:35 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							470f251cbb 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5849: Failed shutdown of the network causes network state to  
						
						 
						
						... 
						
						
						
						be changed to 'Implemented'
Wrong network state transition
s_fsm.addTransition(State.Shutdown, Event.OperationFailed,State.Implemented
fix keeps state as Shutdown 
						
						
							
						
					 
					
						2014-01-13 17:47:47 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							3bea60435e 
							
						 
					 
					
						
						
							
							Remove commented elements  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-13 12:16:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							16d333f06d 
							
						 
					 
					
						
						
							
							Fix coverity issue 606007, 606008  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-13 12:16:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							044a2078a1 
							
						 
					 
					
						
						
							
							Fix coverity issue 573580  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-13 12:16:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							15a08107d8 
							
						 
					 
					
						
						
							
							Fix coverity issue 600070  
						
						 
						
						
						
						
							
						
					 
					
						2014-01-13 12:16:37 +01:00