alena 94fb0612f2 Fixed DB upgrade script - vm_type field can be NULL ... Conflicts: server/src/com/cloud/network/NetworkManagerImpl.java		2011-03-05 10:37:57 -08:00
..
bindir	cloud-set-guest-sshkey script (used by sshKey pair feature, has to be installed on the vm template) is a part of our code base now	2011-03-04 11:31:18 -08:00
db	Fixed DB upgrade script - vm_type field can be NULL	2011-03-05 10:37:57 -08:00
.project	Branch 2.1.refactor committed	2010-08-11 09:13:42 -07:00