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/dc
History
frank 18f87c2108 Merge branch 'cvm' into 2.2.y 
Conflicts:
	api/src/com/cloud/api/BaseCmd.java
	cloud.spec
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/network/security/SecurityGroupListener.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/storage/listener/StoragePoolMonitor.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/SerialVersionUID.java
 		2011-08-19 16:08:35 -07:00
..
dao bug 10222: fixed issue with associate ip introduced more than one nic. The problem is that associate ip automatically creates a nic but doesn't have sufficient information to properly creates so it uses what it knows for sure is the naming pattern to do it. However, we changed the naming pattern and it broke. I fixed it by passing all of the information in the ipaddressTO object. 2011-06-11 13:45:00 -07:00
AccountVlanMapVO.java Moved DAO to server 2010-11-22 07:40:41 -08:00
ClusterDetailsDao.java Add license header to files 2011-04-14 11:23:14 -07:00
ClusterDetailsDaoImpl.java Bug 8966 - Oracle VM (OVM) support 2011-08-05 17:46:29 -07:00
ClusterDetailsVO.java Add license header to files 2011-04-14 11:23:14 -07:00
ClusterVO.java bug 10197: 2011-07-19 15:26:25 -07:00
DataCenterIpAddressVO.java bug 9308: changed instance_id to nic_id 2011-04-04 16:59:16 -07:00
DataCenterLinkLocalIpAddressVO.java bug 9311: changed instance_id to nic_id 2011-04-05 09:12:55 -07:00
DataCenterVO.java Acquire an ip and launch an ELB vm 2011-07-27 12:00:07 -07:00
DataCenterVnetVO.java Moved DAO to server 2010-11-22 07:40:41 -08:00
DcDetailVO.java Start of zonesfeature / mycloud/cloudkit 2011-05-03 10:40:17 -07:00
HostPodVO.java Bug 9331 - Even when there is no longer clusters in the pod, 'Delete Pod - Failed - because there are clusters in this pod' 2011-04-15 16:04:16 -07:00
PodCluster.java Moved DAO to server 2010-11-22 07:40:41 -08:00
PodVlanMapVO.java Moved DAO to server 2010-11-22 07:40:41 -08:00
PodVlanVO.java Moved DAO to server 2010-11-22 07:40:41 -08:00
VlanVO.java Made NetworkId parameter required for Vlan, modified DB schema and corresponding Managers' methods. For Virtual and Direct untagged vlan networkId is got from default system Public/Public-DirectPodBased networks accordingly 2010-12-28 15:15:24 -08:00