Alena Prokharchyk 6420ecbd6f Merge branch 'master' into vpc ... Conflicts: server/src/com/cloud/server/ManagementServerImpl.java		2012-07-24 16:13:06 -07:00
..
com/cloud	Merge branch 'master' into vpc	2012-07-24 16:13:06 -07:00
resources	Switch to Apache license	2012-04-03 04:50:05 -07:00
async-job-component.xml	fixing line endings in server	2012-04-07 20:13:10 -04:00
sync-queue-component.xml	fixing line endings in server	2012-04-07 20:13:10 -04:00