Kishan Kavala 9ea90c3359 Merge branch 'master' into regions ... Conflicts: client/tomcatconf/components.xml.in server/src/com/cloud/api/ApiResponseHelper.java		2013-02-01 11:38:16 +05:30
..
dao	Merging events framework branch into master. This commit will bring	2013-02-01 01:37:24 +05:30
MockConfigurationManagerImpl.java	Merge branch 'master' into regions	2013-02-01 11:38:16 +05:30
MockNetworkManagerImpl.java	Merge branch 'ipv6'	2013-01-31 15:07:33 -08:00
MockResourceLimitManagerImpl.java	Create DB view for Account to speed up ListAccountsCmd, and add missing async job information for some response objects.	2013-01-02 17:38:58 -08:00
MockSite2SiteVpnManagerImpl.java	api: Refactor command and response classes to org.apache.cloudstack.api.*	2012-12-07 19:23:24 -08:00
MockSite2SiteVpnServiceProvider.java	Network-refactor: verify that s2s provider gets injected as expected	2013-01-09 15:49:01 -08:00
MockVpcManagerImpl.java	api: Refactor move acl to org.apache.cloudstack	2013-01-06 15:30:58 -08:00
MockVpcVirtualNetworkApplianceManager.java	server: Fix network refactor regressions for CLOUDSTACK-297	2013-01-30 17:33:53 -08:00
Site2SiteVpnTest.java	network-refactor: fix license issues	2013-01-16 19:25:23 -08:00
VpcApiUnitTest.java	CLOUDSTACK-279: fixed deleteProject when executed by the regular user. Always pass System account as a caller when do account cleanup	2012-10-17 17:26:19 -07:00