mirror of
				https://github.com/apache/cloudstack.git
				synced 2025-11-04 00:02:37 +01:00 
			
		
		
		
	Conflicts: server/src/com/cloud/server/ConfigurationServerImpl.java setup/db/create-schema.sql setup/db/db/schema-304to305.sql
Conflicts: server/src/com/cloud/server/ConfigurationServerImpl.java setup/db/create-schema.sql setup/db/db/schema-304to305.sql