alena 
							
						 
					 
					
						
						
						
						
							
						
						
							b05c69f3b3 
							
						 
					 
					
						
						
							
							bug 11246: return lb rule Id in the async response for createLoadBalancer api  
						
						 
						
						... 
						
						
						
						status 11246: resolved fixed 
						
						
					 
					
						2011-09-13 12:08:12 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							d1cfe58c0f 
							
						 
					 
					
						
						
							
							bug 11412: use "sshkeypair" instead of "keypair" in response name for ssh commands  
						
						 
						
						... 
						
						
						
						status 11412: resolved fixed 
						
						
					 
					
						2011-09-13 11:00:06 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							3cb4ad4934 
							
						 
					 
					
						
						
							
							Add more detail when unable to schedule cleanup  
						
						 
						
						... 
						
						
						
						clean up tests for security group manager v2
move interval to listener -- allows it to be configurable if needed
fix mocks
Enhanced logging for security group manager (from zucchini)
fix merge issues
merge issues 
						
						
					 
					
						2011-09-12 18:22:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							fae5e84699 
							
						 
					 
					
						
						
							
							if the xenserver host cannot do bridge firewalling do not attempt to retry the security rule updat  
						
						 
						
						... 
						
						
						
						change some logs to debug level 
						
						
					 
					
						2011-09-12 18:20:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							65fb83035f 
							
						 
					 
					
						
						
							
							Enable monitoring over JMX  
						
						 
						
						... 
						
						
						
						Add the ability to disable some vms from being scheduled
Add ability to trigger ruleset updates from JMX
added a few more dangerous JMX operations 
						
						
					 
					
						2011-09-12 18:20:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							82fcfe8edc 
							
						 
					 
					
						
						
							
							make signature calculation consistent across management servers  
						
						 
						
						
						
						
					 
					
						2011-09-12 18:20:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							d03c5af720 
							
						 
					 
					
						
						
							
							make instance_id unique to allow usage of ON DUPLICATE KEY  
						
						 
						
						... 
						
						
						
						useful logging
Reduce batch size to 16 to avoid sql errors
try using multi inserts to overcome deadlock during batch update 
						
						
					 
					
						2011-09-12 18:20:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							e216686029 
							
						 
					 
					
						
						
							
							Revert "bug 10617: Intermediate checking"  
						
						 
						
						... 
						
						
						
						revert pending review
This reverts commit 561b27565512d438db3d8896df6f97b644b0b498. 
						
						
					 
					
						2011-09-12 14:45:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							f9b0962ad9 
							
						 
					 
					
						
						
							
							bug 10617: Intermediate checking  
						
						 
						
						... 
						
						
						
						Changes :
         - Fixing API doc +response name + errorMessage
         - Adding seperate events to Egress rules
         - Egress rules Using the same database table as that of ingress with new column type.
   Pending Tasks:
         - db upgrade
         - database table rename from security_ingress_rule to generic name, renaming some of the jave class from ingress to generic name.
         - Retesting on kvm 
						
						
					 
					
						2011-09-09 18:14:19 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							4ad9ac5e71 
							
						 
					 
					
						
						
							
							Bug 11200 - maximum number of guests per host  
						
						 
						
						... 
						
						
						
						Changes:
To make sure migration does not attempt to pick a host that has running VMs more than the max guest VM's limit:
- Changed manual migration to call host allocators to return a list of hosts suitable for migration. Host allocators check for the max guest VM limit.
- Earlier we returned hosts with enough capacity but now Host Allocators make other checks along with capacity. So the list of hosts returned are hosts that have enough capacity AND satisfy all other conditions like host tags, max guests limit etc. Or in other words Allocators dont return the hosts that dont satisfy all conditions even if they have capacity.
-Therefore, now we mark the list of hosts returned for manual migration as 'suitable' hosts instead of 'hasenoughCapacity' in the HostResponse.
- HA migration already calls allocators, so no change is needed there. 
						
						
					 
					
						2011-09-08 18:08:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							4423da06a2 
							
						 
					 
					
						
						
							
							1. added timeout in Command Class,  then each command can configure itself timeout, if timeout is not configed, use the default timeout , which is 30 minute  
						
						 
						
						... 
						
						
						
						2. added following configurable timeout
       PrimaryStorageDownloadWait("Storage", TemplateManager.class, Integer.class, "primary.storage.download.wait", "10800", "In second, timeout for download template to primary storage", null),
       CreateVolumeFromSnapshotWait("Storage", StorageManager.class, Integer.class, "create.volume.from.snapshot.wait", "10800", "In second, timeout for create template from snapshot", null),
       CopyVolumeWait("Storage", StorageManager.class, Integer.class, "copy.volume.wait", "10800", "In second, timeout for copy volume command", null),
       CreatePrivateTemplateFromVolumeWait("Storage", UserVmManager.class, Integer.class, "create.private.template.from.volume.wait", "10800", "In second, timeout for CreatePrivateTemplateFromVolumeCommand", null),
       CreatePrivateTemplateFromSnapshotWait("Storage", UserVmManager.class, Integer.class, "create.private.template.from.snapshot.wait", "10800", "In second, timeout for CreatePrivateTemplateFromSnapshotCommand", null),
       BackupSnapshotWait("Storage", StorageManager.class, Integer.class, "backup.snapshot.wait", "10800", "In second, timeout for BackupSnapshotCommand", null), 
						
						
					 
					
						2011-09-07 19:17:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							905df61aac 
							
						 
					 
					
						
						
							
							bug 11362: Make VM network adapter device type be selectable based on VM-specific details  
						
						 
						
						
						
						
					 
					
						2011-09-07 17:58:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							84868b7f9c 
							
						 
					 
					
						
						
							
							Bug 11200 - maximum number of guests per host  
						
						 
						
						... 
						
						
						
						Changes:
- Adding a new table 'hypervisor_capabilities' that will record capabilities for each hypervisor version. Added db schema changes for this.
- Currently a few capabilities have been added, namely, 'max_guests_limit' and 'security_group_enabled'
- Added a new column 'hypervisor_version' to host table. StartupRouting command now takes in this parameter. It should be set when a host connects.
- If a host's hypervisor version is not present, we find all the capabilities rows for that hypervisor type and use the first record.
- 'max_guests_limit' is the maximum number of running guest Vms that a host can have for the given hypervisor.
- Host Allocators use this limit and skip a host if the number of running VMs on that host exceeds this limit. 
						
						
					 
					
						2011-09-07 14:53:05 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							f9d5a46871 
							
						 
					 
					
						
						
							
							Compare current and previous network stats before updating. Ignore stats if the current stats are not same as the prev stats. Set NetworkUsageAnswer log level to debug  
						
						 
						
						
						
						
					 
					
						2011-09-05 18:41:42 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							b35e85c571 
							
						 
					 
					
						
						
							
							bug 10712: Display name instead of id  
						
						 
						
						
						
						
					 
					
						2011-09-05 15:55:07 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							4d3d47f01c 
							
						 
					 
					
						
						
							
							bug 11304: restore host status after initialization failure  
						
						 
						
						
						
						
					 
					
						2011-09-02 15:19:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							8b5f2c758e 
							
						 
					 
					
						
						
							
							Do account permission checks for snapshots the way it's done for all other ControlledEntities  
						
						 
						
						
						
						
					 
					
						2011-08-31 18:15:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							9abb544865 
							
						 
					 
					
						
						
							
							bug 6876: netscaler MPX & VPX support  
						
						 
						
						... 
						
						
						
						- adding supprt for Netscaler VPX & MPX load blancers
    - implemented for virtual networking
    - works only with new fetched public IP, inline support is not added yet 
						
						
					 
					
						2011-08-30 00:14:05 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							1fefdd628d 
							
						 
					 
					
						
						
							
							Bug 11261 - Allow to update host tags  
						
						 
						
						... 
						
						
						
						Changes:
- Changes to updateHostCmd to accepts hosttags parameter
- Changes to wipe out existing tags and save new ones in host_tags DB.
- UpdateHost is Admin only operation - so only root admin can update host tags 
						
						
					 
					
						2011-08-25 13:01:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							8c53dbcdd7 
							
						 
					 
					
						
						
							
							bug 11185: support multiple CIDR on overlapping port ranges for firewall rules  
						
						 
						
						... 
						
						
						
						status 11185: resolved fixed
Conflicts:
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
Conflicts:
	api/src/com/cloud/network/firewall/FirewallService.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java 
						
						
					 
					
						2011-08-25 12:21:11 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							05440f0905 
							
						 
					 
					
						
						
							
							Bug 9921 - template tags  
						
						 
						
						... 
						
						
						
						Changes:
- CreateTemplate and RegisterTemplate now support adding a template tag. It is a string value. This is root-admin only action - only admin can add template tags.
- ListTemplates will return the template tag in response.
- HostAllocator changed to use template tag along with the existing tag on service offering. If both tags are present, allocator now finds hosts satisfying both tags. If no hosts have both tags, allocation will fail.
- DB changes to add new column to vm_template table.
- DB upgrade changes for upgrade from 2.2.10 to 2.2.11 
						
						
					 
					
						2011-08-25 12:03:59 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							9391938908 
							
						 
					 
					
						
						
							
							fix conflict  
						
						 
						
						
						
						
					 
					
						2011-08-24 18:47:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							e3f179844e 
							
						 
					 
					
						
						
							
							bug 11236: domainAdmin/regularUser can edit/delete/copy/extract Public template/iso only if it was created by them. They still can use/see public template/iso when execute list/deploy/attachIso commands.  Root admin can operate with other people templates w/o any restrictions.  
						
						 
						
						... 
						
						
						
						status 11236: resolved fixed 
						
						
					 
					
						2011-08-24 14:48:35 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							d3eb9db7fa 
							
						 
					 
					
						
						
							
							bug 11204: when search for domR/dhcp, include Role to the corresponding search to eliminate getting "LB" network element in the response  
						
						 
						
						... 
						
						
						
						status 11204: resolved fixed
Conflicts:
	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java 
						
						
					 
					
						2011-08-23 12:05:53 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							c2732850f4 
							
						 
					 
					
						
						
							
							bug 11202: added "networkRate" param to service offering api responses  
						
						 
						
						
						
						
					 
					
						2011-08-22 13:35:43 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							0b061529b1 
							
						 
					 
					
						
						
							
							bug 11202: added "networkRate" param to service offering api responses  
						
						 
						
						
						
						
					 
					
						2011-08-22 13:34:47 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							32ee2dbe2c 
							
						 
					 
					
						
						
							
							Remove baremetal specific parameters from AddHostCmd  
						
						 
						
						
						
						
					 
					
						2011-08-19 17:12:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							4369b0ba96 
							
						 
					 
					
						
						
							
							bug 1067:  
						
						 
						
						... 
						
						
						
						- covered basic impelementation for xen, need to test corner cases.
      - Not implemneted: kvm, vmware , listing of egress rules. 
						
						
					 
					
						2011-08-19 11:10:16 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							ea102aa045 
							
						 
					 
					
						
						
							
							add host guid in migrate command  
						
						 
						
						
						
						
					 
					
						2011-08-18 11:03:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							ed7214c710 
							
						 
					 
					
						
						
							
							add host guid in migrate command  
						
						 
						
						
						
						
					 
					
						2011-08-16 10:30:52 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							b9183c0840 
							
						 
					 
					
						
						
							
							bug 10561: merging code from 2.2.10 to master  
						
						 
						
						
						
						
					 
					
						2011-08-16 14:20:51 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							11d06f3d6a 
							
						 
					 
					
						
						
							
							Added missing license headers  
						
						 
						
						
						
						
					 
					
						2011-08-15 14:24:46 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							5fd0ff5610 
							
						 
					 
					
						
						
							
							Added missing license headers  
						
						 
						
						
						
						
					 
					
						2011-08-15 14:24:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							d72200bbfc 
							
						 
					 
					
						
						
							
							If one of the static nat rules failed to apply on the backend, the end result should be false  
						
						 
						
						
						
						
					 
					
						2011-08-15 10:18:44 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							891f02f4d4 
							
						 
					 
					
						
						
							
							Resend firewall rules on domR restart  
						
						 
						
						
						
						
					 
					
						2011-08-15 10:18:10 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							803255b0ba 
							
						 
					 
					
						
						
							
							bug 11029: db upgrade from 2.2.9 to 2.2.10 includes firewall_rule upgrade now  
						
						 
						
						... 
						
						
						
						status 11029: resolved fixed
Commit also includes the following:
* map firewall rule to pf/lb/staticNat/vpn when the firewall rule is created as a part of pf/lb/staticNat/vpn rule creation
* when delete firewall rules, also delete related firewall rule 
						
						
					 
					
						2011-08-15 10:18:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							0969ba8063 
							
						 
					 
					
						
						
							
							bug 10923: changes for snapshot command to carry primary storage pool path  
						
						 
						
						
						
						
					 
					
						2011-08-12 17:45:02 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							cc60989a68 
							
						 
					 
					
						
						
							
							bug 10923: changes for snapshot command to carry primary storage pool path  
						
						 
						
						
						
						
					 
					
						2011-08-12 17:43:18 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							5ef0c96e70 
							
						 
					 
					
						
						
							
							bug 11096: ExtractTemplate - For private template choose the correct sec storage host id since its not present in all the sec storage now.  
						
						 
						
						
						
						
					 
					
						2011-08-12 14:30:34 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							f1d13729af 
							
						 
					 
					
						
						
							
							bug 11096: ExtractTemplate - For private template choose the correct sec storage host id since its not present in all the sec storage now.  
						
						 
						
						
						
						
					 
					
						2011-08-12 12:21:02 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							ba3bb68035 
							
						 
					 
					
						
						
							
							fix merge issues  
						
						 
						
						
						
						
					 
					
						2011-08-11 16:53:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							51af0db682 
							
						 
					 
					
						
						
							
							mass merge 2.2.10  
						
						 
						
						
						
						
					 
					
						2011-08-11 16:41:52 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								keshav 
							
						 
					 
					
						
						
						
						
							
						
						
							df5f48c093 
							
						 
					 
					
						
						
							
							Added parameter to enable the firewall rule UI to the list capabilities API.  
						
						 
						
						
						
						
					 
					
						2011-08-11 12:03:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								keshav 
							
						 
					 
					
						
						
						
						
							
						
						
							4da9b6bfb4 
							
						 
					 
					
						
						
							
							Added parameter to enable the firewall rule UI to the list capabilities API.  
						
						 
						
						
						
						
					 
					
						2011-08-11 11:54:41 -07:00