Murali Reddy 0f9f428ad1 Merge branch 'master' into events-framework ... Conflicts: api/src/com/cloud/event/EventTypes.java server/src/com/cloud/network/firewall/FirewallManagerImpl.java tools/whisker/LICENSE tools/whisker/descriptor-for-packaging.xml		2013-01-31 19:52:27 +05:30
..
dao	Merge branch 'master' into events-framework	2013-01-17 23:56:37 +05:30
MockConfigurationManagerImpl.java	api: move and group all under command, org.apache.cloudstack.command.*	2012-12-07 18:30:54 -08:00
MockNetworkManagerImpl.java	CLOUDSTACK-297: Reset SSH key to access VM	2013-01-30 17:33:44 -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