etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server
History
Alena Prokharchyk ca2fc30655 Merge branch 'master' into internallb1 
Conflicts:
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	setup/db/db/schema-410to420.sql
 		2013-04-23 16:58:28 -07:00
..
conf conf: Add a @ so @MSUSER@ is replaced by "cloud" 2013-04-03 16:54:00 +02:00
resources/com/cloud/upgrade CLOUDSTACK-1818: add a missing file that is missed in previous patch 2013-03-29 11:12:36 -07:00
scripts License header updates for the server folder. 2012-08-03 09:41:27 -04:00
src Merge branch 'master' into internallb1 2013-04-23 16:58:28 -07:00
test Merge branch 'master' into internallb1 2013-04-23 16:58:28 -07:00
pom.xml Temporarely disabing vpc test as some part of it requires connection to the real DB. Will re-enable after fixing the problem 2013-04-19 12:42:42 -07:00