cloudstack/server/test/com/cloud/vpc/dao
Murali Reddy 053831b0aa Merge branch 'master' into events-framework
Conflicts:
	api/src/com/cloud/network/Network.java
	plugins/pom.xml
	server/pom.xml
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/NetworkDaoImpl.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java
2013-01-17 23:56:37 +05:30
..
MockConfigurationDaoImpl.java Patch from Gavin Lee: Change license to ASL2.0 in server and tools 2012-08-30 10:36:29 -04:00
MockNetworkDaoImpl.java Merge branch 'master' into events-framework 2013-01-17 23:56:37 +05:30
MockNetworkOfferingDaoImpl.java Patch from Gavin Lee: Change license to ASL2.0 in server and tools 2012-08-30 10:36:29 -04:00
MockNetworkOfferingServiceMapDaoImpl.java Patch from Gavin Lee: Change license to ASL2.0 in server and tools 2012-08-30 10:36:29 -04:00
MockNetworkServiceMapDaoImpl.java Patch from Gavin Lee: Change license to ASL2.0 in server and tools 2012-08-30 10:36:29 -04:00
MockVpcDaoImpl.java Patch from Gavin Lee: Change license to ASL2.0 in server and tools 2012-08-30 10:36:29 -04:00
MockVpcOfferingDaoImpl.java Patch from Gavin Lee: Change license to ASL2.0 in server and tools 2012-08-30 10:36:29 -04:00
MockVpcOfferingServiceMapDaoImpl.java Patch from Gavin Lee: Change license to ASL2.0 in server and tools 2012-08-30 10:36:29 -04:00
MockVpcVirtualRouterElement.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