cloudstack/server
Alena Prokharchyk 1aa4ad6a3c CLOUDSTACK-572: Advance SG enabled zone - allow deploying vm in SG disabled Account specific networks
Conflicts:

	server/src/com/cloud/vm/UserVmManagerImpl.java
2012-11-30 12:47:37 -08:00
..
conf License header updates for the server folder. 2012-08-03 09:41:27 -04:00
scripts License header updates for the server folder. 2012-08-03 09:41:27 -04:00
src/com/cloud CLOUDSTACK-572: Advance SG enabled zone - allow deploying vm in SG disabled Account specific networks 2012-11-30 12:47:37 -08:00
test CLOUDSTACK-424: Update userdata should propagate to VR 2012-11-15 18:43:51 +05:30
pom.xml maven : declare mysql-connector-java dependency into dependencyManagement section of cloudstack pom and use the version 5.1.21 only 2012-11-20 09:27:07 +01:00