Marcus Sorensen c4c9d2d879 Summary: Fixes for api_refactoring ... Detail: api_refactoring branch was recently merged into master. This pulls in those changes and fixes conflicts. Tested to ensure functionality was intact. Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1357778902 -0700		2013-01-09 17:48:22 -07:00
..
apidoc	Summary: Fixes for api_refactoring	2013-01-09 17:48:22 -07: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	devcloud: Fixed regression for network.conf commit 97fe053e2e	2012-12-17 13:16:32 -08:00
git	Summary: Add Bugfix-for line to prepare-commit-msg	2012-11-07 10:07:07 -07:00
marvin	S3-backed Secondary Storage	2013-01-02 10:28:47 -08: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