Marcus Sorensen c541f15dcd Merge branch 'master' into resizevolume ... Conflicts: test/integration/smoke/test_volumes.py		2013-01-16 14:00:48 -07:00
..
apidoc	Revert "apidoc: Remove api discovery from toc"	2013-01-14 20:55:13 -08:00
bugs-wiki	fixing license headers in marvin	2012-07-04 18:45:08 -04:00
build	docs: Build the installation guide instead of "all"	2012-10-22 12:08:11 +02:00
cli	cli: Cosmetic fix for prompt of cloudmonkey	2013-01-06 17:30:00 -08:00
devcloud	Summary: Adding apache license headers to various devcloud configs	2013-01-15 14:21:44 -07:00
devcloud-kvm	Summary: Change template details in devcloud-kvm sql file	2013-01-16 10:24:14 -07:00
git	Summary: Add Bugfix-for line to prepare-commit-msg	2012-11-07 10:07:07 -07:00
marvin	Merge branch 'master' into resizevolume	2013-01-16 14:00:48 -07:00
waf	Patch from Gavin Lee: Change license to ASL2.0 in server and tools	2012-08-30 10:36:29 -04:00
whisker	CLOUDSTACK-697: Reordered the LICENSE and NOTICE file content (as well as descriptor.xml).	2012-12-21 10:35:50 -05:00