Brian Federle 698a1bb3cd Merge branch 'master' of git.cloud.com:/var/lib/git/cloudstack-oss ... Conflicts: client/WEB-INF/classes/resources/messages.properties		2012-03-28 15:03:17 -07:00
..
WEB-INF	Merge branch 'master' of git.cloud.com:/var/lib/git/cloudstack-oss	2012-03-28 15:03:17 -07:00
bindir	Bug 9479 - provide option for built in https	2011-09-01 17:09:06 -07:00
distro	Bug 11357 - cloud-management dead but pid file exists	2012-01-12 13:54:00 -08:00
tomcatconf	Bug 10808: Add Upload Volume api and do validation.	2012-03-24 13:59:59 +05:30
.classpath	fixed all the broken thirdparty stuff	2011-01-31 10:51:01 -08:00
.project	change client/.project to client not vmopsClient	2011-09-22 13:37:12 -07:00