Alena Prokharchyk 26cefdcfac When UUID field is null for existing records, set it to id ... Conflicts: server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java		2013-05-14 15:11:41 -07:00
..
conf	conf: Add a @ so @MSUSER@ is replaced by "cloud"	2013-04-03 16:54:00 +02:00
resources/com/cloud/upgrade	CLOUDSTACK-1818: add a missing file that is missed in previous patch	2013-03-29 11:12:36 -07:00
scripts	License header updates for the server folder.	2012-08-03 09:41:27 -04:00
src	When UUID field is null for existing records, set it to id	2013-05-14 15:11:41 -07:00
test	CLOUDSTACK-2441: Fix deleting private gateways while deleting vpc in case multiple private gateways	2013-05-14 16:10:38 +05:30
pom.xml	merge master	2013-05-11 15:28:43 +05:30