Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							18cd05a6a2
							
						
					 | 
					
						
						
							
							bug 11481: cloudStack 2.2 - router page - add "Migration System VM" action.
						
						
						
						
						
						
					 | 
					
						2011-10-07 15:55:10 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							cd02613173
							
						
					 | 
					
						
						
							
							bug 11481: cloudStack 2.2 - system VM page - add "Migration System VM" action.
						
						
						
						
						
						
					 | 
					
						2011-10-07 15:54:51 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							8023d9486e
							
						
					 | 
					
						
						
							
							cloudStack - sync 2.2.Y UI change to master branch.
						
						
						
						
						
						
					 | 
					
						2011-09-29 15:35:45 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							425f084f39
							
						
					 | 
					
						
						
							
							bug 11607: cloudStack - Make client API path and client Console path configurable in the UI code.
						
						
						
						
						
						
					 | 
					
						2011-09-29 12:20:02 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							4557b5d54e
							
						
					 | 
					
						
						
							
							bug 11525: cloudStack 2.2 UI - Domain Admin can only edit/delete/copy/download his own template just like a user.
						
						
						
						
						
						
					 | 
					
						2011-09-22 16:17:36 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							10062a04eb
							
						
					 | 
					
						
						
							
							bug 11446: cloudStack 2.2.y - authorizeSecurityGroupIngress API response has changed. Here is corresponding UI change.
						
						
						
						
						
						
					 | 
					
						2011-09-15 10:25:59 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							58841d0bc4
							
						
					 | 
					
						
						
							
							bug 11441: cloudStack - host page - Edit Host - fix a bug that hosttags editing field didn't get refresh when clicking different hosts in middle menu.
						
						
						
						
						
						
					 | 
					
						2011-09-14 12:09:04 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							4e17c23f80
							
						
					 | 
					
						
						
							
							bug 11433: cloudStack - Acquire IP Address dialog - get element ID by a different way.
						
						
						
						
						
						
					 | 
					
						2011-09-14 11:45:46 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							08592da39e
							
						
					 | 
					
						
						
							
							cloudStack - VM Wizard - fix a bug that comes and goes: "$soTemplate is undefined"
						
						
						
						
						
						
					 | 
					
						2011-09-14 10:08:22 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							de9856f1c4
							
						
					 | 
					
						
						
							
							cloudStack - sync UI change from 2.2.y branch to mater branch.
						
						
						
						
						
						
					 | 
					
						2011-09-13 16:00:46 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							ff3316b3f9
							
						
					 | 
					
						
						
							
							bug 11080: cloudStack - Add Primary Storage dialog - (1) add new protocol "OCFS2" to hypervisorType "OVM".  (2) When "OCFS2" is selected, show/hide other fields like NFS is selected, except no server field.
						
						
						
						
						
						
					 | 
					
						2011-08-30 15:23:19 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							2b5e673b0a
							
						
					 | 
					
						
						
							
							bug 11261: cloudStack - host page - Edit Host action - (1) make hosttags editable.  (2) consolidate update OS category from dialog box to main screen.
						
						
						
						
						
						
					 | 
					
						2011-08-25 17:28:00 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							b6f715771e
							
						
					 | 
					
						
						
							
							bug 11260: cloudStack - create system service offering dialog: add network rate field.
						
						
						
						
						
						
					 | 
					
						2011-08-25 15:26:36 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							a3645e3e46
							
						
					 | 
					
						
						
							
							bug 11255: cloudStack - IP address page - add a missing semicolon.
						
						
						
						
						
						
					 | 
					
						2011-08-25 15:01:44 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							e19cff6beb
							
						
					 | 
					
						
						
							
							bug 11255: cloudStack - IP address page - Create Firewall rule - fix a bug on Google Chrome that changing protocol dropdown (e.g. from TCP to ICMP) wouldn't correctly hide/show related input fields.
						
						
						
						
						
						
					 | 
					
						2011-08-25 14:40:08 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							91910dd50e
							
						
					 | 
					
						
						
							
							bug 11255: cloudStack - IP address page - Create Firewall rule - fix a JavaScript syntax bug.
						
						
						
						
						
						
					 | 
					
						2011-08-25 14:39:44 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							617cb5a058
							
						
					 | 
					
						
						
							
							cloudStack - pass "forVirtualNetwork=false" when creating IP range for public network in an security-group-enabled (advanced) zone.
						
						
						
						
						
						
					 | 
					
						2011-08-24 14:22:38 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							e4fccab0a1
							
						
					 | 
					
						
						
							
							cloudStack - sync instance.js from 2.2.y branch to master branch.
						
						
						
						
						
						
					 | 
					
						2011-08-23 10:44:24 -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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							24edb0071d
							
						
					 | 
					
						
						
							
							cloudStack - merge UI change from 2.2.10 branch to master branch.
						
						
						
						
						
						
					 | 
					
						2011-08-22 14:09:59 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							7184d073b9
							
						
					 | 
					
						
						
							
							bug 11202: cloudStack - Service Offering page - fix a bug that Network Rate didn't get refreshed when another service offering is selected.
						
						
						
						
						
						
					 | 
					
						2011-08-22 13:56:03 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							fc6086067c
							
						
					 | 
					
						
						
							
							bug 11202: cloudStack - Service Offering page - add Network Rate in grid.
						
						
						
						
						
						
					 | 
					
						2011-08-22 13:56:01 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							47776f5814
							
						
					 | 
					
						
						
							
							bug 11202: cloudStack - Create Service Offering dialog - add Network Rate field.
						
						
						
						
						
						
					 | 
					
						2011-08-22 13:56:00 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							b607e4aa1c
							
						
					 | 
					
						
						
							
							Merge branch '2.2.y' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.2.y
						
						
						
						
						
						
					 | 
					
						2011-08-19 17:29:57 -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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							0cce5c44c2
							
						
					 | 
					
						
						
							
							bug 10790: cloudStack - Volume page - hide Storage from domain-admin as well.
						
						
						
						
						
						
					 | 
					
						2011-08-19 15:05:45 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							301a5f7bcc
							
						
					 | 
					
						
						
							
							bug 11175: cloudStack - convert firewallRuleUiEnabled from boolean to string before saving to cookie.
						
						
						
						
						
						
					 | 
					
						2011-08-19 13:49:47 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							b60ee0df37
							
						
					 | 
					
						
						
							
							bug 11176: cloudStack - IP Address page - Firewall tab - add firewall rule - (1) Hide ICMP Type, ICMP Code when protocol TCP or UDP is selected. (2) Hide Start Port, End Port when protocol ICMP is selected.
						
						
						
						
						
						
					 | 
					
						2011-08-19 13:12:12 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							3a7d79a91e
							
						
					 | 
					
						
						
							
							bug 11175: cloudStack - IP address page - fix the logic of showing/hiding Firewall tab for Static NAT IP.
						
						
						
						
						
						
					 | 
					
						2011-08-19 11:31:28 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							6ec4a6c3b4
							
						
					 | 
					
						
						
							
							bug 11175: cloudStack - IP address page - fix the logic of showing/hiding Firewall tab.
						
						
						
						
						
						
					 | 
					
						2011-08-19 11:10:53 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							eb18d6dd55
							
						
					 | 
					
						
						
							
							bug 10977: cloudStack - instance page - provide "Migrate Instance" action to all hypervisors.
						
						
						
						
						
						
					 | 
					
						2011-08-15 10:18:43 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							2ef10a5993
							
						
					 | 
					
						
						
							
							bug 10977: cloudStack - instance page - limit "Migrate Instance" action to be only available for XenServer and VMware (because KVM does not support Migrate Instance).
						
						
						
						
						
						
					 | 
					
						2011-08-11 16:51:54 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							6d9faceaa2
							
						
					 | 
					
						
						
							
							bug 10977: cloudStack - instance page - provide "Migrate Instance" action to all hypervisors.
						
						
						
						
						
						
					 | 
					
						2011-08-11 16:31:26 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							0c1d89b357
							
						
					 | 
					
						
						
							
							bug 10843: cloudStack - Instance page - statistics tab - show "N/A" when NetworkRead/NetworkWrite is null or equal to zero.
						
						
						
						
						
						
					 | 
					
						2011-08-11 16:30:56 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							4ab76f3021
							
						
					 | 
					
						
						
							
							bug 10843: cloudStack - Instance page - statistics tab - show "N/A" when NetworkRead/NetworkWrite is equal to zero. (2)
						
						
						
						
						
						
					 | 
					
						2011-08-11 16:12:43 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							e750ae728d
							
						
					 | 
					
						
						
							
							cloudStack - sync UI change from 2.2.10 branch to 2.2.y branch.
						
						
						
						
						
						
					 | 
					
						2011-08-11 15:58:38 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							142c943cc9
							
						
					 | 
					
						
						
							
							cloudStack - IP Address page - hide network tab for system-owned IP.
						
						
						
						
						
						
					 | 
					
						2011-08-11 15:47:27 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							a50f20a9b5
							
						
					 | 
					
						
						
							
							cloudStack - IP Address page - for elasticLB-basicZone, do not open firewall when creating load balancer rule and IP.
						
						
						
						
						
						
					 | 
					
						2011-08-11 15:46:49 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							f68caf5884
							
						
					 | 
					
						
						
							
							bug 11070: cloudStack - delete account - fix a bug that an API error showed after account was deleted ("listAccounts&id=N")
						
						
						
						
						
						
					 | 
					
						2011-08-11 15:46:07 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							263c4430a5
							
						
					 | 
					
						
						
							
							bug 11016: cloudStack - Host page - add "host tags" in grid.
						
						
						
						
						
						
					 | 
					
						2011-08-11 10:10:38 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							bac6b60f6c
							
						
					 | 
					
						
						
							
							bug 11065: cloudStack - cluster page - remove action "Manage Cluster" and "Unmanage Cluster".
						
						
						
						
						
						
					 | 
					
						2011-08-11 10:10:08 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							6e27486e27
							
						
					 | 
					
						
						
							
							cloudStack - IP Address page - add a new tab "Firewall".
						
						
						
						
						
						
					 | 
					
						2011-08-10 19:23:24 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							7e324b099d
							
						
					 | 
					
						
						
							
							cloudStack - IP Address page - port forwarding, port range - remove protocol option "ICMP".
						
						
						
						
						
						
					 | 
					
						2011-08-10 12:34:18 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							9eabe886e5
							
						
					 | 
					
						
						
							
							cloudStack - IP Address page - Load Balancer tab - remove Source CIDR.
						
						
						
						
						
						
					 | 
					
						2011-08-10 12:33:50 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							8369e7ae7a
							
						
					 | 
					
						
						
							
							cloudStack - IP Address page - Port Forwarding tab - remove Source CIDR.
						
						
						
						
						
						
					 | 
					
						2011-08-10 12:33:34 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							dbd6fd9826
							
						
					 | 
					
						
						
							
							bug 11025: cloudStack - Elastic Load Balancer - IP address page - continue calling listPublicIpAddresses API instead of showing error when supportELB is "false".
						
						
						
						
						
						
					 | 
					
						2011-08-10 10:42:19 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chiradeep Vittal
							
						 
					 | 
					
						
						
						
						
							
						
						
							ed36020eba
							
						
					 | 
					
						
						
							
							fix for bad merge
						
						
						
						
						
						
					 | 
					
						2011-08-08 17:58:24 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chiradeep Vittal
							
						 
					 | 
					
						
						
						
						
							
						
						
							f0e7b4beb1
							
						
					 | 
					
						
						
							
							fix for bad merge
						
						
						
						
						
						
					 | 
					
						2011-08-08 17:58:13 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chiradeep Vittal
							
						 
					 | 
					
						
						
						
						
							
						
						
							8277584b8a
							
						
					 | 
					
						
						
							
							merge ELB / nectarine branch
						
						
						
						
						
						
					 | 
					
						2011-08-08 15:20:56 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							6aaf3d5ae0
							
						
					 | 
					
						
						
							
							Merge branch 'cvm'
						
						
						
						
						
						
						
						Conflicts:
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/storage/Storage.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/storage/StorageManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/SerialVersionUID.java 
						
						
					 | 
					
						2011-08-08 14:14:09 -07:00 | 
					
					
						
						
							
							
							
						
					 |