Edison Su 0bbb8437cd CLOUDSTACK-4506: fix NPE in case hostid is null ... Conflicts: server/src/com/cloud/capacity/CapacityManagerImpl.java		2014-03-27 17:38:35 -07:00
..
conf	Summary: Updated sudoers approved commands for cloud user	2013-10-23 13:42:16 -07:00
resources	Merge branch 'master' into rbac.	2014-03-13 11:05:03 -07:00
scripts	License header updates for the server folder.	2012-08-03 09:41:27 -04:00
src	CLOUDSTACK-4506: fix NPE in case hostid is null	2014-03-27 17:38:35 -07:00
test	Fixes to ensure Network entity checkAccess invokes the IAM service	2014-03-24 17:09:43 -07:00
pom.xml	Removed all reminants of the IdentityService. Created the KeysManager to move the management	2014-01-14 13:11:35 -08:00