Min Chen 0d580ccb26 Fix NPE in adding host and also put back lost change in deployDataCenter ... due to rebase with master.		2013-05-11 22:00:40 -07:00
..
cache	Invoke reatetmplt.sh script after copying template from S3 to cache	2013-05-11 18:19:29 -07:00
datamotion	Merge with latest code rebased from master	2013-05-11 21:05:54 -07:00
image	Fix NPE in adding host and also put back lost change in deployDataCenter	2013-05-11 22:00:40 -07:00
integration-test	fix compile, after rebase to master	2013-05-10 20:39:02 -07:00
snapshot	Merged with head	2013-05-10 16:33:57 -07:00
src/org/apache/cloudstack/storage	Merge with latest code rebased from master	2013-05-11 21:05:54 -07:00
volume	Merge with latest code rebased from master	2013-05-11 21:05:54 -07:00
pom.xml	CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms	2013-02-20 16:42:56 +05:30
storage.ucls	Fix license on xml.in, jsp and ucls files on javelin	2013-01-12 06:34:34 -08:00