cloudstack/server/test/com/cloud/network
Murali Reddy a718d353f7 Merge branch 'master' into portablepublicip
Conflicts:
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/addr/PublicIp.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	setup/db/db/schema-410to420.sql
2013-05-13 21:22:19 +05:30
..
dao ElbVmMapDaoTest requires active DB backend for tests, hence jenkins test fails. 2012-08-16 12:59:00 -07:00
firewall fixed unit tests from merge 2013-01-18 15:58:55 -08:00
security merge master 2013-05-11 15:28:43 +05:30
vpn Improve component lifecycle management with system run-level concept 2013-01-30 15:21:02 -08:00
DedicateGuestVlanRangesTest.java merge master 2013-05-11 15:28:43 +05:30
MockFirewallManagerImpl.java Merge latest master into javelin 2013-01-31 11:34:49 -08:00
MockNetworkManagerImpl.java Merge branch 'master' into portablepublicip 2013-05-13 21:22:19 +05:30
MockNetworkModelImpl.java merge master 2013-05-11 15:28:43 +05:30
MockRulesManagerImpl.java merge master 2013-05-11 15:28:43 +05:30
NetworkManagerTest.java fixed unit tests from merge 2013-01-18 15:58:55 -08:00
NetworkManagerTestComponentLibrary.java fixed unit tests from merge 2013-01-18 15:58:55 -08:00
NetworkModelTest.java Making unit tests work 2013-01-22 11:18:51 -08:00
UpdatePhysicalNetworkTest.java Cloudstack-701 Support for non contiguous vlan ranges. 2013-04-17 10:14:42 +05:30