Marcus Sorensen c541f15dcd Merge branch 'master' into resizevolume ... Conflicts: test/integration/smoke/test_volumes.py		2013-01-16 14:00:48 -07:00
..
WEB-INF	CLOUDSTACK-646: Cleaning up Citrix/eula/CloudPlatform references	2012-12-16 20:39:03 -08:00
bindir	Improved handling of unknown OS, Distribution	2013-01-13 15:08:04 +05:30
distro	Summary: Fixes for api_refactoring	2013-01-09 17:48:22 -07:00
tomcatconf	Merge branch 'master' into resizevolume	2013-01-16 14:00:48 -07:00
cloudstack-ui.launch	client: Re-add missing license header in client/cloudstack-ui.launch	2012-12-23 02:47:27 -08:00
pom.xml	Summary: Fixes for api_refactoring	2013-01-09 17:48:22 -07:00