etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server/test/com/cloud/vpc
History
Prachi Damle ca1a7948f1 Merge branch 'master' into affinity_groups 
Conflicts:
	api/src/org/apache/cloudstack/api/BaseCmd.java
	client/tomcatconf/applicationContext.xml.in
	client/tomcatconf/componentContext.xml.in
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/user/AccountManagerImpl.java
	setup/db/db/schema-410to420.sql
 		2013-04-05 13:49:20 -07:00
..
dao CLOUDSTACK-749: updated mockvpcdao mockvpcmanagerimpl with external device related changes 2013-02-25 18:54:30 +05:30
MockConfigurationManagerImpl.java API to list planners and set the planner in Service offering 2013-03-29 10:41:46 -07:00
MockNetworkManagerImpl.java CLOUDSTACK-1895: save placeholder nic with not null vmType='DomainRouter' when placeholder is used for the VR ip address 2013-04-04 13:29:17 -07:00
MockNetworkModelImpl.java CLOUDSTACK-1895: save placeholder nic with not null vmType='DomainRouter' when placeholder is used for the VR ip address 2013-04-04 13:29:17 -07:00
MockResourceLimitManagerImpl.java CLOUDSTACK-1156: Limit Primary and Secondary storage for domain/accounts 2013-03-29 11:26:38 +05:30
MockSite2SiteVpnManagerImpl.java Improve component lifecycle management with system run-level concept 2013-01-30 15:21:02 -08:00
MockSite2SiteVpnServiceProvider.java Improve component lifecycle management with system run-level concept 2013-01-30 15:21:02 -08:00
MockVpcManagerImpl.java Fixes/improvements for VPC feature: 2013-03-29 16:56:01 -07:00
MockVpcVirtualNetworkApplianceManager.java Fixes/improvements for VPC feature: 2013-03-29 16:56:01 -07:00
Site2SiteVpnTest.java fixed unit tests from merge 2013-01-18 15:58:55 -08:00
VpcApiUnitTest.java Fixes/improvements for VPC feature: 2013-03-29 16:56:01 -07:00
VpcTestConfiguration.java Removing ^M's from code. 2013-04-04 00:53:20 +05:30