mirror of
https://github.com/apache/cloudstack.git
synced 2025-12-16 18:43:26 +01:00
c4c9d2d879
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