alena 
							
						 
					 
					
						
						
						
						
							
						
						
							7aab227b37 
							
						 
					 
					
						
						
							
							Added one more default network offering - with guestType=Isolated and with DNS/DHCP/USERDATA services supported  
						
						
						
						
					 
					
						2011-11-07 10:50:42 -08:00 
						 
				 
			
				
					
						
							
							
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							5f93665a30 
							
						 
					 
					
						
						
							
							- Send network labels to hypervisor recource during processConnect  
						
						... 
						
						
						
						- Create Default physicalnetwork and add traffic types while creating a zone
- DeleteProvider should error out if there are networks using the provider.
- Other validations 
						
						
					 
					
						2011-11-04 17:57:05 -07:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							92edf56ccc 
							
						 
					 
					
						
						
							
							Bug 7883 - Add support to allow admins to sort templates, isos, offerings...  
						
						... 
						
						
						
						status 7883: resolved fixed 
						
						
					 
					
						2011-11-03 10:54:00 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							29b19db152 
							
						 
					 
					
						
						
							
							NaaS: Fix createNetworkOffering with multiply service providers  
						
						
						
						
					 
					
						2011-11-02 19:08:49 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							b646f07f9c 
							
						 
					 
					
						
						
							
							NaaS: Add back service offering ID for network offering  
						
						... 
						
						
						
						It would be used to adjust service offering of virtual router 
						
						
					 
					
						2011-11-02 19:08:37 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							3e20c60d6d 
							
						 
					 
					
						
						
							
							Fixed vm deployment in Basic zone  
						
						
						
						
					 
					
						2011-11-02 17:02:44 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							f42c9e434f 
							
						 
					 
					
						
						
							
							Basic zone: the System Guest network offering can be created from any Shared Guest network offering.  
						
						... 
						
						
						
						Limitation:
* in order to make the networkOffering choice, only one Shared network has to be Enabled at the moment when Basic zone is being created 
						
						
					 
					
						2011-11-02 15:44:53 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							3fc9b149e4 
							
						 
					 
					
						
						
							
							NaaS: Add portforwarding and staticnat service provider  
						
						... 
						
						
						
						Make them service rather than capability of firewall. Now firewall only means
open/close the port. 
						
						
					 
					
						2011-11-02 15:18:39 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							4ce2bf2f89 
							
						 
					 
					
						
						
							
							SourceNat service is supported for Isolated network offerings only  
						
						
						
						
					 
					
						2011-11-02 11:52:23 -07:00 
						 
				 
			
				
					
						
							
							
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							6aa743165a 
							
						 
					 
					
						
						
							
							Changes  to support Enable/ Disable services of a service provider added to physical network:  
						
						... 
						
						
						
						- ListSupportedNetworkServiceProvidersCmd will now return Providers along with its element's services and boolean 'canEnableIndividualServices' that indicates if for this Provider services can be enabled/disabled
- add & update NetworkServiceProvider changed to take in the list of services to enable. While adding a provider, if list is null then all services supported by the element are enabled by default.
- ListNetworkServices enhanced to take in a provider name and returns services of that specific provider. 
						
						
					 
					
						2011-11-01 18:03:55 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							2250dff349 
							
						 
					 
					
						
						
							
							1) Removed tags from the network object  
						
						... 
						
						
						
						2) Get hypervisor tags from the physical network instead. 
						
						
					 
					
						2011-11-01 17:42:06 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							be21a5e37c 
							
						 
					 
					
						
						
							
							Don't allow enabling securityGroup service for Isolated networks  
						
						
						
						
					 
					
						2011-11-01 13:09:14 -07:00 
						 
				 
			
				
					
						
							
							
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							b1f78bca25 
							
						 
					 
					
						
						
							
							bug 5822, 10783: Use encryption/decryption for queries which use sql directly  
						
						... 
						
						
						
						status 5822, 10783: resolved fixed 
						
						
					 
					
						2011-11-01 19:30:00 +05:30 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							46dac852fa 
							
						 
					 
					
						
						
							
							Merge branch 'swift'  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/agent/AgentManager.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java 
						
						
					 
					
						2011-10-31 15:04:48 -07:00 
						 
				 
			
				
					
						
							
							
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							818df189c5 
							
						 
					 
					
						
						
							
							changes to Create Vlan & Public IPs  
						
						
						
						
					 
					
						2011-10-31 09:53:25 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							7b982efeaa 
							
						 
					 
					
						
						
							
							Fixed Advance zone creation with security group enabled  
						
						
						
						
					 
					
						2011-10-28 10:24:37 -07:00 
						 
				 
			
				
					
						
							
							
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							1583211352 
							
						 
					 
					
						
						
							
							Fixing build after removing physicalNetworkId  from createvlanIpRangeCmd  
						
						
						
						
					 
					
						2011-10-27 17:42:42 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							d315e57b0e 
							
						 
					 
					
						
						
							
							Renamed "type" to "guestType"  
						
						
						
						
					 
					
						2011-10-27 16:51:42 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							fe0b685e95 
							
						 
					 
					
						
						
							
							Security group is a service now  
						
						
						
						
					 
					
						2011-10-27 16:49:20 -07:00 
						 
				 
			
				
					
						
							
							
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							70aae9666b 
							
						 
					 
					
						
						
							
							bug 10774: On removing storage, local storage, cluster handle deletion of corresponding op_host_capacity rows.  
						
						
						
						
					 
					
						2011-10-27 11:23:26 +05:30 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							b91dce4f8a 
							
						 
					 
					
						
						
							
							Swift:  add listtemplate for swift  
						
						... 
						
						
						
						add swift configuration 
						
						
					 
					
						2011-10-25 20:21:27 -07:00 
						 
				 
			
				
					
						
							
							
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							809f9d965e 
							
						 
					 
					
						
						
							
							Fixed NetworkMgr: getNetworkCapabilities.  
						
						... 
						
						
						
						The key used to get the capabilities from the provider capabilities map was wrong. 
						
						
					 
					
						2011-10-25 18:51:20 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							525a0a7675 
							
						 
					 
					
						
						
							
							1)Changed implementation for restart network: call shutdown/implement methods as a part of it  
						
						... 
						
						
						
						2)Re-apply all existing firewall rules as a part of implement call. TODO: Cleanup all existing rules from the backend (leave them in the DB) as a part of shutdown call 
						
						
					 
					
						2011-10-25 18:24:24 -07:00 
						 
				 
			
				
					
						
							
							
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							766c898504 
							
						 
					 
					
						
						
							
							Changes: DeletePhysicalNetwork changes and Configuring NetworkMgr to hold map of providers -> elements  
						
						
						
						
					 
					
						2011-10-24 18:03:18 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							75c8e33226 
							
						 
					 
					
						
						
							
							Removed guestIpType from network/networkOffering  
						
						
						
						
					 
					
						2011-10-24 17:05:00 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							abca3dda9d 
							
						 
					 
					
						
						
							
							Added ability to list network offerings availabe for network upgrade using listNetworkOfferings command with "networkId" parameter.  
						
						... 
						
						
						
						Limitations:
* can't upgrade to the network offering with lesser number of services
* can upgrade only when the service provider of the original offering is not external (domR, dhcp, elb) to the external type of the provider 
						
						
					 
					
						2011-10-21 15:36:01 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							219978a9be 
							
						 
					 
					
						
						
							
							Create network using physical network id  
						
						
						
						
					 
					
						2011-10-20 18:25:13 -07:00 
						 
				 
			
				
					
						
							
							
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							654eaec663 
							
						 
					 
					
						
						
							
							NAAS: Configuring Zone  
						
						... 
						
						
						
						- Create Zone changes and changes to data_center table to remove vlan, securityGroup fields
- Physical Network lifecycle APIs
- Physical Network Service Provider APIs
- DB schema changes 
						
						
					 
					
						2011-10-19 22:44:03 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							c5acad39d9 
							
						 
					 
					
						
						
							
							Make Guest Direct security group enabled network offering system by default - we'll make it non-system after getting rid of Basic/Advance zone concepts  
						
						
						
						
					 
					
						2011-10-19 17:34:21 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							ceda05298e 
							
						 
					 
					
						
						
							
							Deprecate guestIpType in networkOffering api. Use type (Shared/Isolated) instead  
						
						
						
						
					 
					
						2011-10-19 16:38:39 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							c00058adc2 
							
						 
					 
					
						
						
							
							Added type (Shared/Isolated) to the networkOffering/networks  
						
						
						
						
					 
					
						2011-10-13 17:33:41 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							2d228dfcbb 
							
						 
					 
					
						
						
							
							Default service provider to VirtualRouter (should make this parameter configurable in the future)  
						
						
						
						
					 
					
						2011-10-12 18:02:35 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							7433d5314a 
							
						 
					 
					
						
						
							
							1) Refactored networkOfferings:  
						
						... 
						
						
						
						* moved all services to the separate table, map them to the network_offering+provider.
* added state/securityGroupEnabled properties for the networkOffering
* added ability to list by state/securityGroupEnabled in listNetworkOfferings api command
2) New service: SourceNat 
						
						
					 
					
						2011-10-12 16:38:59 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							30d48c40b3 
							
						 
					 
					
						
						
							
							Network as a service(NaaS): Separate redundant virtual router as a standalone element  
						
						... 
						
						
						
						Since we would introduce a way to specify each service provider in the network
offering, it's better for redundant virtual router as a separate service
provider.
Also isRedundant() flag in the network offering would be removed. Redundant
virtual router temporality won't work from now. Until we're able to add
different network elements/service providers in network_offering. 
						
						
					 
					
						2011-10-10 15:41:07 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							a17570ef51 
							
						 
					 
					
						
						
							
							1)Implemented Suspend/Activate project  
						
						... 
						
						
						
						2)Email/token based invitation system 
						
						
					 
					
						2011-10-06 16:10:36 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							25c2734e03 
							
						 
					 
					
						
						
							
							More stuff to Projects feature - added support for adding resources (vms, templates, isos) to the project  
						
						
						
						
					 
					
						2011-10-05 13:24:25 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							9f9b60a287 
							
						 
					 
					
						
						
							
							1) Added resource limits for the Projects - the same as for the account  
						
						... 
						
						
						
						2) Added "Project" limit type for the Domain object 
						
						
					 
					
						2011-09-21 17:09:49 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							a1331d1cfc 
							
						 
					 
					
						
						
							
							Intermidiate checkin to Project feature:  
						
						... 
						
						
						
						1) Introduce new managers - ProjectManager and DomainManager. Moved all domain related code from AccountManager to DomainManager.
2) Moved some code from ManagementServerImpl to the correct managers.
3) New resource limit for Domain - Project 
						
						
					 
					
						2011-09-20 18:35:28 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							f6a79c603f 
							
						 
					 
					
						
						
							
							bug 11036: resource count update is refactored  
						
						... 
						
						
						
						status 11036: resolved fixed
1) Use row locks instead of global lock when update resource_count table. When update resource_count for account, make sure that we lock account+all related domains
2) Insert resource_count records for account/domain at the moment when account/domain is created.
3) As a part of DB upgrade, insert missing resource_count records for all non-removed accounts/domains
Conflicts:
	core/src/com/cloud/alert/AlertManager.java
	server/test/com/cloud/agent/MockAgentManagerImpl.java 
						
						
					 
					
						2011-09-13 10:47:36 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							47d9cbd2ee 
							
						 
					 
					
						
						
							
							bug 11331: allow extending vnet range as a part of updateZone call  
						
						... 
						
						
						
						status 11331: resolved fixed 
						
						
					 
					
						2011-09-06 17:40:28 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							35b551a199 
							
						 
					 
					
						
						
							
							bug 11260: Take networkRate for domR's guest and public interface from the corresponding system service offering  
						
						
						
						
					 
					
						2011-08-25 14:15:12 -07:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							85f18ff256 
							
						 
					 
					
						
						
							
							fix build, add test rpm back  
						
						
						
						
					 
					
						2011-08-24 13:24:51 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							8a7feb8ec1 
							
						 
					 
					
						
						
							
							Merge branch '2.2.y'  
						
						... 
						
						
						
						Conflicts:
	agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
	api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
	api/src/com/cloud/agent/api/to/FirewallRuleTO.java
	api/src/com/cloud/agent/api/to/IpAddressTO.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	api/src/com/cloud/api/commands/CreateFirewallRuleCmd.java
	api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java
	api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
	api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java
	api/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java
	api/src/com/cloud/api/commands/ListCapabilitiesCmd.java
	api/src/com/cloud/api/commands/UpdateNetworkCmd.java
	api/src/com/cloud/api/response/CapabilitiesResponse.java
	api/src/com/cloud/network/Network.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/firewall/FirewallService.java
	api/src/com/cloud/network/lb/LoadBalancingRule.java
	api/src/com/cloud/network/lb/LoadBalancingRulesService.java
	api/src/com/cloud/network/rules/FirewallRule.java
	api/src/com/cloud/network/rules/RulesService.java
	api/src/com/cloud/offering/NetworkOffering.java
	client/tomcatconf/commands.properties.in
	cloud.spec
	core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
	core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
	core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	core/src/com/cloud/vm/DomainRouterVO.java
	debian/cloud-deps.install
	patches/systemvm/debian/config/etc/init.d/cloud-early-config
	patches/systemvm/debian/config/root/ipassoc.sh
	patches/systemvm/debian/config/root/loadbalancer.sh
	scripts/vm/hypervisor/kvm/rundomrpre.sh
	scripts/vm/hypervisor/xenserver/vmops
	server/src/com/cloud/agent/manager/AgentAttache.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/agent/manager/AgentMonitor.java
	server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
	server/src/com/cloud/alert/ClusterAlertAdapter.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/cluster/ClusterManagerImpl.java
	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/configuration/ConfigurationManager.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
	server/src/com/cloud/network/LoadBalancerVO.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDao.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/element/DhcpElement.java
	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/FirewallManager.java
	server/src/com/cloud/network/rules/FirewallRuleVO.java
	server/src/com/cloud/network/rules/PortForwardingRuleVO.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/rules/StaticNatRuleImpl.java
	server/src/com/cloud/network/security/SecurityGroupListener.java
	server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/server/ConfigurationServerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/StorageManager.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
	server/src/com/cloud/upgrade/dao/Upgrade228to229.java
	server/src/com/cloud/upgrade/dao/Upgrade229to2210.java
	server/src/com/cloud/user/AccountManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	server/src/com/cloud/vm/dao/DomainRouterDao.java
	server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
	setup/db/create-index-fk.sql
	setup/db/create-schema.sql
	setup/db/db/schema-222to224.sql
	setup/db/db/schema-227to228.sql
	setup/db/db/schema-228to229.sql
	setup/db/db/schema-229to2210.sql
	tools/testClient/README
	ui/scripts/cloud.core.instance.js
	utils/src/com/cloud/utils/SerialVersionUID.java
	utils/src/com/cloud/utils/db/ConnectionConcierge.java
	utils/src/com/cloud/utils/db/Merovingian2.java
	utils/src/com/cloud/utils/db/Transaction.java
	utils/src/com/cloud/utils/nio/Link.java
	utils/src/com/cloud/utils/nio/NioConnection.java
	utils/src/com/cloud/utils/time/InaccurateClock.java 
						
						
					 
					
						2011-08-22 20:28:30 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							31a022c720 
							
						 
					 
					
						
						
							
							Added networkRate parameter to createServiceOffering api command  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/configuration/ConfigurationManager.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java 
						
						
					 
					
						2011-08-22 12:05:34 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							033765f93f 
							
						 
					 
					
						
						
							
							Added networkRate parameter to createServiceOffering api command  
						
						
						
						
					 
					
						2011-08-22 12:02:08 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							e5e85d05e9 
							
						 
					 
					
						
						
							
							bug 10695: add XCP 1.0 support  
						
						... 
						
						
						
						status 10695: resolved fixed
Conflicts:
	core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java 
						
						
					 
					
						2011-08-09 19:51:32 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							33b3e02c17 
							
						 
					 
					
						
						
							
							bug 10695: add XCP 1.0 support  
						
						... 
						
						
						
						status 10695: resolved fixed 
						
						
					 
					
						2011-08-09 19:49:12 -07:00 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							bf0e761be1 
							
						 
					 
					
						
						
							
							checking domain list syntax  
						
						
						
						
					 
					
						2011-08-03 14:45:23 +05:30 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							f6303c13fb 
							
						 
					 
					
						
						
							
							bug 10812: putting key in ZoneConfig and other nomenclature changes  
						
						
						
						
					 
					
						2011-08-03 14:42:29 +05:30 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							cd78c5cb9b 
							
						 
					 
					
						
						
							
							bug 10812: putting key in ZoneConfig and other nomenclature changes  
						
						
						
						
					 
					
						2011-08-03 14:32:28 +05:30