cloudstack/server
Kishan Kavala 29a399b9ae CLOUDSTACK-4289, CLOUDSTACK-4290, CLOUDSTACK-4291 : Check for null when populated UUID while listing usage records.
Filed CLOUDSTACK-4299 to make these entities always available.

Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java
2013-08-13 18:53:00 +05:30
..
conf Changed the log4j config files to log org.apache.cloudstack in debug and change the layout format 2013-07-26 20:35:49 -07: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 CLOUDSTACK-4289, CLOUDSTACK-4290, CLOUDSTACK-4291 : Check for null when populated UUID while listing usage records. 2013-08-13 18:53:00 +05:30
test Resolved merge conflicts 2013-08-12 20:15:24 -07:00
pom.xml Revert "Reverting the range of commits that broke the build" 2013-08-08 15:02:40 -07:00