Alena Prokharchyk 0e0b75a041 Merge branch 'master' into vpc ... Conflicts: api/src/com/cloud/api/ApiConstants.java		2012-08-02 18:45:37 -07:00
..
conf	fixing line endings in server	2012-04-07 20:13:10 -04:00
scripts	…
src/com/cloud	Merge branch 'master' into vpc	2012-08-02 18:45:37 -07:00
test	Merge branch 'master' into vpc	2012-08-02 18:45:37 -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