mirror of https://github.com/apache/cloudstack.git
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 |
||
|---|---|---|
| .. | ||
| dao | ||
| MockConfigurationManagerImpl.java | ||
| MockNetworkManagerImpl.java | ||
| MockResourceLimitManagerImpl.java | ||
| MockSite2SiteVpnManagerImpl.java | ||
| MockVpcManagerImpl.java | ||
| VpcApiUnitTest.java | ||