Alena Prokharchyk 766b7a2706 Merge branch 'master' into vpc ... Conflicts: server/src/com/cloud/api/ApiResponseHelper.java		2012-07-23 16:38:58 -07:00
..
conf	fixing line endings in server	2012-04-07 20:13:10 -04:00
scripts	Source code committed	2010-08-11 09:13:29 -07:00
src/com/cloud	Merge branch 'master' into vpc	2012-07-23 16:38:58 -07:00
test	VPC: when VPC router gets destroyed and recreated, plug public nic for each Vlan where VPC public ips belong to	2012-07-20 17:12:34 -07:00
.classpath	bug 6745: Using UUID instead of integers - for System VM s	2011-11-03 07:33:57 -07:00
.project	Fix corrupted eclipse project settings, schema fixes and updated template download url	2010-09-29 18:41:54 -07:00