Alena Prokharchyk 7d0338bd82 listPublicIpAddresses: when do join with nics table, count only non-removed nics ... Conflicts: server/src/com/cloud/server/ManagementServerImpl.java		2012-07-24 12:42:46 -07:00
..
conf	fixing line endings in server	2012-04-07 20:13:10 -04:00
scripts
src/com/cloud	listPublicIpAddresses: when do join with nics table, count only non-removed nics	2012-07-24 12:42:46 -07:00
test	Fixed broken unittest	2012-07-24 10:30:39 -07:00
.classpath	bug 6745: Using UUID instead of integers - for System VM s	2011-11-03 07:33:57 -07:00
.project