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
History
Chiradeep Vittal cadca5fc0c Merge branch 'master' into network-refactor-merge2 
Conflicts:
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
	plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
	server/src/com/cloud/acl/DomainChecker.java
	server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
 		2013-01-16 19:17:14 -08:00
..
agent bug CS-16036 ResourceManagerTest does not test what is says it tests 2012-08-16 12:11:41 -07:00
alert Network-refactor: verify injection is correct. Verify that dhcp service providers and ip deployers get injected independently in addition to the list of network elements 2013-01-09 15:49:02 -08:00
api Create DB view for ListStoragePools API performance optimization. 2013-01-08 12:33:18 -08:00
async CLOUDSTACK-304: Synchronization support for createSnapshot command - don't sent more than "concurrent.snapshots.threshold.perhost" createSnapshots commands to the backend host. 2012-10-10 13:40:00 -07:00
cluster Patch from Chip Childers 2012-07-02 09:51:21 -04:00
keystore commit ba3fef5d0650c42463d0f225f4ca14b5f9046c44 2012-12-17 17:44:39 -08:00
network Merge branch 'master' into network-refactor-merge2 2013-01-16 19:17:14 -08:00
projects Move view based VO and Dao classes to cloud-server module to hide the 2012-12-14 10:47:58 -08:00
resource Network-refactor: verify injection is correct. Verify that dhcp service providers and ip deployers get injected independently in addition to the list of network elements 2013-01-09 15:49:02 -08:00
snapshot Patch from Chip Childers 2012-07-02 09:51:21 -04:00
storage/dao Patch from Chip Childers 2012-07-02 09:51:21 -04:00
upgrade Fixed version number in upgrade script comment (replaced 3.0.3 with 3.0.2) 2012-08-13 16:50:06 -07:00
user Merge branch 'master' into network-refactor-merge2 2013-01-16 19:17:14 -08:00
utils/db Patch from Chip Childers 2012-07-02 09:51:21 -04:00
vm Move view based VO and Dao classes to cloud-server module to hide the 2012-12-14 10:47:58 -08:00
vpc Merge branch 'master' into network-refactor-merge2 2013-01-16 19:17:14 -08:00