cloudstack/server/test/com/cloud/network
Rohit Yadav 5119785cf7 Get latest changes, merge branch 'master' into api_refactoring
Conflicts:
	api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
	server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
	server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
	setup/db/db/schema-40to410.sql

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-04 22:21:20 -08:00
..
dao ElbVmMapDaoTest requires active DB backend for tests, hence jenkins test fails. 2012-08-16 12:59:00 -07:00
security Move view based VO and Dao classes to cloud-server module to hide the 2012-12-14 10:47:58 -08:00
MockNetworkManagerImpl.java Get latest changes, merge branch 'master' into api_refactoring 2013-01-04 22:21:20 -08:00