mirror of
				https://github.com/apache/cloudstack.git
				synced 2025-10-26 08:42:29 +01:00 
			
		
		
		
	Conflicts: engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>