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
Alena Prokharchyk a1acfd3bfa Merge branch 'master' into vpc 
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/network/Network.java
	client/tomcatconf/components.xml.in
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/guru/GuestNetworkGuru.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
	setup/db/create-schema.sql
 		2012-07-13 13:52:58 -07:00
..
agent Patch from Chip Childers 2012-07-02 09:51:21 -04:00
async Patch from Chip Childers 2012-07-02 09:51:21 -04:00
cluster Patch from Chip Childers 2012-07-02 09:51:21 -04:00
keystore Patch from Chip Childers 2012-07-02 09:51:21 -04:00
network VPC: CS-15553 and CS-15549 - more checks during automatic ip assoc to VPC network 2012-07-13 13:32:14 -07: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 Patch from Chip Childers 2012-07-02 09:51:21 -04:00
user Patch from Chip Childers 2012-07-02 09:51:21 -04:00
utils/db Patch from Chip Childers 2012-07-02 09:51:21 -04:00
vm Merge branch 'master' into vpc 2012-07-13 13:52:58 -07:00