Wilder Rodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							c81b3380df 
							
						 
					 
					
						
						
							
							Applying the latest chances from the VPC Refactor branch onto the new one.  
						
						 
						
						... 
						
						
						
						We will keep this branch as clean as possible to avoid problems with merge. 
						
						
					 
					
						2014-10-14 15:08:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Antonio Fornie 
							
						 
					 
					
						
						
						
						
							
						
						
							2802d3b75b 
							
						 
					 
					
						
						
							
							Refactor and test NetworkHelper#sendCommandsToRouterWithNoAnswers  
						
						 
						
						
						
						
					 
					
						2014-10-14 15:02:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wrodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							01edc8e394 
							
						 
					 
					
						
						
							
							adding setupPrivateGateway to new style;  
						
						 
						
						... 
						
						
						
						removing methods from Vpc appliance;
changing the way VpcElement calls the command;
there is still work tob e done with the destroyPrivateGateway rule.
Conflicts:
	server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/NetworkTopology.java 
						
						
					 
					
						2014-10-14 15:02:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wrodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							adebaf2bd0 
							
						 
					 
					
						
						
							
							adding applyStaticRoutes to the new visitor pattern.  
						
						 
						
						
						
						
					 
					
						2014-10-14 15:02:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wrodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							16ad4122b4 
							
						 
					 
					
						
						
							
							moving sendCommand to the NetworkGeneralHelper;  
						
						 
						
						... 
						
						
						
						adding handle single network method to the NetworkGeneralHelper;
moving getRealPriority to the NetworkGeneralHelper;
making priority constants part of the VirtualNetworkApplianceManager;
changing the network topology implementation in order to use the NetworkGeneralManager instead of the appliance
Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java 
						
						
					 
					
						2014-10-14 15:02:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Antonio Fornie 
							
						 
					 
					
						
						
						
						
							
						
						
							d2d9157ab0 
							
						 
					 
					
						
						
							
							Complete tests for normal deployment and start vpc one  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java 
						
						
					 
					
						2014-10-14 15:01:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wilder Rodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							12b0d188cb 
							
						 
					 
					
						
						
							
							Replacing the old [Vpc}VirtualNetworkApplianceManager by the new ones;  
						
						 
						
						... 
						
						
						
						Implement the missing commands related to DHCP PV Lan and DHCP SubNet
Conflicts:
	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/DhcpRules.java
	server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
	server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
	server/src/org/apache/cloudstack/network/topology/NetworkTopologyVisitor.java 
						
						
					 
					
						2014-10-14 15:01:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wilder Rodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							b97f2b05c7 
							
						 
					 
					
						
						
							
							apply network acls; acls items to pvt gw; vpc ip association  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java 
						
						
					 
					
						2014-10-14 15:01:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wilder Rodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							e35fded401 
							
						 
					 
					
						
						
							
							commenting broken code in tests in order to run build adn tests other changes via the UI  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/test/com/cloud/network/router/VirtualNetworkApplianceManagerImplTest.java 
						
						
					 
					
						2014-10-14 15:01:12 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Antonio Fornie 
							
						 
					 
					
						
						
						
						
							
						
						
							95395f9574 
							
						 
					 
					
						
						
							
							Deployment more OO - Objects with data and behavior  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
						
						
					 
					
						2014-10-14 15:01:12 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Antonio Fornie 
							
						 
					 
					
						
						
						
						
							
						
						
							24b230d11b 
							
						 
					 
					
						
						
							
							Fix dependency problem. Extract and unify router deployment stuff  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
						
						
					 
					
						2014-10-14 14:55:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Antonio Fornie 
							
						 
					 
					
						
						
						
						
							
						
						
							f28426e1a2 
							
						 
					 
					
						
						
							
							Extract general behavior to Router and Vpc delegates  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
						
						
					 
					
						2014-10-14 14:51:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								amoghvk 
							
						 
					 
					
						
						
						
						
							
						
						
							fbcab01ff0 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect"  
						
						 
						
						... 
						
						
						
						This reverts commit d910b4ff14bcf5d9e7892b5ffd39acb47745f106 since it is causing encryption/decryption issues with RPM builds 
						
						
					 
					
						2014-10-09 15:39:19 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							123ec8b3d3 
							
						 
					 
					
						
						
							
							CLOUDSTACK:7323: [vGPU] Creation of VM snapshot with "memory" is failing.  
						
						 
						
						... 
						
						
						
						VM snapshot with memory is not supported for VGPU VMs, so putting checks
for same. 
						
						
					 
					
						2014-10-08 19:21:12 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							d910b4ff14 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect  
						
						 
						
						... 
						
						
						
						GPU enabled hosts from non-GPU VM deployment.
Cluster reordering is based on the number of unique host tags in a cluster,
cluster with most number of unique host tags will put at the end of list.
Hosts with GPU capability will get tagged with implicit tags defined by
global config param 'implicit.host.tags' at the time os host discovery.
Also added FirstFitPlannerTest unit test file. 
						
						
					 
					
						2014-10-07 16:49:38 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								amoghvk 
							
						 
					 
					
						
						
						
						
							
						
						
							0ef6cd36c4 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect"  
						
						 
						
						... 
						
						
						
						This reverts commit 39fe766c2b6fb6edd4c1bf828625b29d9bb87719. 
						
						
					 
					
						2014-10-02 13:28:52 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							39fe766c2b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect  
						
						 
						
						... 
						
						
						
						GPU enabled hosts from non-GPU VM deployment.
Cluster reordering is based on the number of unique host tags in a cluster,
cluster with most number of unique host tags will put at the end of list.
Hosts with GPU capability will get tagged with implicit tags defined by
global config param 'implicit.host.tags' at the time os host discovery.
Also added FirstFitPlannerTest unit test file. 
						
						
					 
					
						2014-10-01 17:25:41 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							47365ac4ba 
							
						 
					 
					
						
						
							
							Fix incorrectly written unit tests.  
						
						 
						
						
						
						
					 
					
						2014-09-02 17:55:44 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							591a686d77 
							
						 
					 
					
						
						
							
							server: fix server package after auth plugin refactor  
						
						 
						
						... 
						
						
						
						- Have opensaml dependency to get version from root pom
- add com.cloud.api.auth.APIAuthenticationManagerImpl to spring ctx manager
- Fix getCommands() in APIAuthenticationManagerImpl
- Fix imports in resources, test and src classes
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2014-08-28 19:45:23 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							f11dcf8ef5 
							
						 
					 
					
						
						
							
							ApiServletTest: Fix test, now login/logout have their own API/class  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2014-08-12 12:01:31 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							736ff5f8e5 
							
						 
					 
					
						
						
							
							Fixed CLOUDSTACK-7303 [LDAP] while importing ldap users, update the user info if it already exists in cloudstack  
						
						 
						
						
						
						
					 
					
						2014-08-11 17:54:31 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							8b98cc2202 
							
						 
					 
					
						
						
							
							CS-19072: fixed broken pagination and count in listNetworkOfferings  
						
						 
						
						
						
						
					 
					
						2014-07-28 14:44:04 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							7f14da6406 
							
						 
					 
					
						
						
							
							rats  
						
						 
						
						
						
						
					 
					
						2014-07-23 21:31:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							b8112ac79e 
							
						 
					 
					
						
						
							
							highlevel 'unit'-test for refactoring of (Vpc)VirtualNetworkApplianceManagerImpl  
						
						 
						
						
						
						
					 
					
						2014-07-23 21:30:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							3b76278b97 
							
						 
					 
					
						
						
							
							rvr4vpc: more interesting test  
						
						 
						
						
						
						
					 
					
						2014-07-17 15:32:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							d3e7b43ee9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7119. [VMware] Don't allow VM reset when VM has snapshots.  
						
						 
						
						
						
						
					 
					
						2014-07-17 13:32:16 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							27bc791746 
							
						 
					 
					
						
						
							
							rats  
						
						 
						
						
						
						
					 
					
						2014-07-17 09:23:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							5b37c65577 
							
						 
					 
					
						
						
							
							oversimplified test fixed  
						
						 
						
						
						
						
					 
					
						2014-07-16 17:28:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							cc37eb50cf 
							
						 
					 
					
						
						
							
							checkstyle: unused imports  
						
						 
						
						
						
						
					 
					
						2014-07-16 16:52:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							799258662c 
							
						 
					 
					
						
						
							
							rvr4vpc simple test for deployRouter  
						
						 
						
						
						
						
					 
					
						2014-07-16 16:44:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							dbc7d80329 
							
						 
					 
					
						
						
							
							Aggregate command cleanup is not required for the virtual router as we  
						
						 
						
						... 
						
						
						
						already cleanup in the finish.
And consequently dies if somebody tries to test with assertions enabled. 
						
						
					 
					
						2014-07-16 16:24:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							5ccd904e83 
							
						 
					 
					
						
						
							
							simple first test for backward compatibility testing in rvr4vpc work  
						
						 
						
						
						
						
					 
					
						2014-07-16 10:59:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							73b622c823 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7068: addIpToNicCmd changed to BaseAsyncCreate  
						
						 
						
						
						
						
					 
					
						2014-07-09 14:57:25 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							0c9c5a71b4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4364: Restore VM - log a usage event for newly created volume  
						
						 
						
						
						
						
					 
					
						2014-06-30 14:41:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							cd0ef09344 
							
						 
					 
					
						
						
							
							Fix typo and add the right exception to the error map.  
						
						 
						
						
						
						
					 
					
						2014-06-25 15:51:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							c79ab570b0 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-6967: Initial OVM3 drop"  
						
						 
						
						... 
						
						
						
						This reverts commit 8a485b9b59e4108e862022baf7477f768380b325. 
						
						
					 
					
						2014-06-24 10:24:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Funs 
							
						 
					 
					
						
						
						
						
							
						
						
							8a485b9b59 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6967: Initial OVM3 drop  
						
						 
						
						... 
						
						
						
						Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
(cherry picked from commit ed47763e2525a21fa4578d199492462d0fb1c7ef)
Conflicts:
	api/src/com/cloud/network/NetworkService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
	plugins/pom.xml
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	ui/scripts/docs.js 
						
						
					 
					
						2014-06-23 12:39:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							cc98d44542 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6922: Updated events for firewall ingress and egress  
						
						 
						
						
						
						
					 
					
						2014-06-19 15:06:56 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							8a1eed24b9 
							
						 
					 
					
						
						
							
							Fix AccountManager unit testcase.  
						
						 
						
						
						
						
					 
					
						2014-05-22 22:33:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							b259bccee7 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6742: listVolumes - As regularuser , able to list Vms and  
						
						 
						
						... 
						
						
						
						volumes of other users. 
						
						
					 
					
						2014-05-22 18:28:00 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							ba848087f8 
							
						 
					 
					
						
						
							
							Disable IAM feature from 4.4 release.  
						
						 
						
						
						
						
					 
					
						2014-05-22 18:27:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							df6ce24f43 
							
						 
					 
					
						
						
							
							if networkID is not specified, get one network with free ips.  
						
						 
						
						
						
						
					 
					
						2014-05-21 14:33:52 -07: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							94ab870d42 
							
						 
					 
					
						
						
							
							null pointer dereference fix  
						
						 
						
						... 
						
						
						
						Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2014-04-29 21:46:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							f4779b4d0c 
							
						 
					 
					
						
						
							
							Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account  
						
						 
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/user/AccountService.java
	plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java
	plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java
Signed-off-by: Koushik Das <koushik@apache.org> 
						
						
					 
					
						2014-04-29 14:49:06 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							dd55095fd5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6530: Populate the first class entities in the context to be available for publishing more information for the event bus, checking the displayable property etc.  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 3e7ea4e8d99a92872007f11a09ab87c8ba61e1da) 
						
						
					 
					
						2014-04-28 18:21:48 -07:00