etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server/src/com/cloud/configuration
History
Alena Prokharchyk e7a1862867 VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr 
Conflicts:

	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/ha/UserVmDomRInvestigator.java
 		2012-08-03 14:23:45 -07:00
..
dao Patch from Chip Childers 2012-07-02 09:51:21 -04:00
CloudZonesComponentLibrary.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
Config.java VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr 2012-08-03 14:23:45 -07:00
ConfigurationManager.java Merge branch 'master' into vpc 2012-07-03 17:32:50 -07:00
ConfigurationManagerImpl.java Merge branch 'master' into vpc 2012-08-02 18:45:37 -07:00
DefaultComponentLibrary.java VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr 2012-08-03 14:23:45 -07:00
DefaultInterceptorLibrary.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
PremiumComponentLibrary.java moving out NetApp code to plugins/file-systems/netapp 2012-07-02 08:34:02 -07:00
ZoneConfig.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00