Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							24894e2354 
							
						 
					 
					
						
						
							
							bug 11302: dont allow stuff like BPDUS, don't allow vms to connect to hypervisor  
						
						
						
						
					 
					
						2011-12-29 17:35:24 -08:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							4718f194ef 
							
						 
					 
					
						
						
							
							bug 12772: typo  
						
						
						
						
					 
					
						2011-12-29 16:01:41 -08:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							338aa3e2a8 
							
						 
					 
					
						
						
							
							accidental commit  
						
						
						
						
					 
					
						2011-12-29 16:01:41 -08:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							a51ee064ee 
							
						 
					 
					
						
						
							
							bug 11302: more efficient caching of keyword  
						
						
						
						
					 
					
						2011-12-29 16:01:41 -08:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							c05903b2d0 
							
						 
					 
					
						
						
							
							bug 11302: support new CSP for SP2.  
						
						... 
						
						
						
						conditional check : --match-set vs --set
forgot to merge this in from 2.2.y 
						
						
					 
					
						2011-12-29 16:01:40 -08:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							363aea4aee 
							
						 
					 
					
						
						
							
							Bug 12731 - Ebtable rules are blocking all traffic going out of VMs in basic zone  
						
						... 
						
						
						
						status 12731: resolved fixed
reviewed-by: edison 
						
						
					 
					
						2011-12-22 15:04:15 -08:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							c00d663df2 
							
						 
					 
					
						
						
							
							use soft mount for secondary storage  
						
						
						
						
					 
					
						2011-12-21 20:31:40 -08:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							61eab674d2 
							
						 
					 
					
						
						
							
							bug 12328: XenServer 6.0 changes vnc-port path in xenstore  
						
						... 
						
						
						
						status 12328: resolved fixed 
						
						
					 
					
						2011-12-21 12:00:27 -08:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							5dfa0ed169 
							
						 
					 
					
						
						
							
							remove obsolete file  
						
						
						
						
					 
					
						2011-12-19 10:56:52 -08:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							2278477737 
							
						 
					 
					
						
						
							
							add stronger security to defend against attacks originating in the vm  
						
						
						
						
					 
					
						2011-12-19 10:56:52 -08:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							5393a44c56 
							
						 
					 
					
						
						
							
							bug 12290: improve antispoofing lgic  
						
						... 
						
						
						
						handle reboot within vm correctly
iptables -S missing in csp 
						
						
					 
					
						2011-12-19 10:56:52 -08:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							331bd6c103 
							
						 
					 
					
						
						
							
							SWIFT: add error handling code  
						
						... 
						
						
						
						add swift plugin for XenServer 6.0 
						
						
					 
					
						2011-12-14 19:53:56 -08:00 
						 
				 
			
				
					
						
							
							
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							0c1e21ab80 
							
						 
					 
					
						
						
							
							bug 10617: vmops related changes.  
						
						
						
						
					 
					
						2011-12-01 19:32:57 +05:30 
						 
				 
			
				
					
						
							
							
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							09905b641b 
							
						 
					 
					
						
						
							
							bug 10617: merge code from branch bug10617.  
						
						
						
						
					 
					
						2011-12-01 14:17:52 +05:30 
						 
				 
			
				
					
						
							
							
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							f1b99f4f07 
							
						 
					 
					
						
						
							
							Revert "bug 10617: merging code from branch bug10617"  
						
						... 
						
						
						
						This reverts commit 8bc33448b9220534ba0ddc6c642ffb1e69d5844e.
Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java 
						
						
					 
					
						2011-11-11 20:23:26 +05:30 
						 
				 
			
				
					
						
							
							
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							02adbd4bd3 
							
						 
					 
					
						
						
							
							bug 10617: merging code from branch bug10617  
						
						
						
						
					 
					
						2011-11-10 15:23:48 +05:30 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							91aa145f5d 
							
						 
					 
					
						
						
							
							Upgrade: no error for this statement  
						
						
						
						
					 
					
						2011-11-04 20:39:39 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							de4d5f0397 
							
						 
					 
					
						
						
							
							Upgrade : script fix  
						
						
						
						
					 
					
						2011-11-04 20:39:26 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							548839e3bb 
							
						 
					 
					
						
						
							
							bug 11903: create local link when host is connected  
						
						... 
						
						
						
						status 11903: resolved fixed 
						
						
					 
					
						2011-11-04 20:39:05 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							245cd32281 
							
						 
					 
					
						
						
							
							upgrade : fix script  
						
						
						
						
					 
					
						2011-11-04 20:38:42 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							f30ee3fc91 
							
						 
					 
					
						
						
							
							Upgrade :  eject CD  
						
						
						
						
					 
					
						2011-11-04 20:38:15 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							1e86b5e1a6 
							
						 
					 
					
						
						
							
							script fix  
						
						
						
						
					 
					
						2011-11-02 17:05:30 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							f41a9e8b23 
							
						 
					 
					
						
						
							
							propagate local link network  
						
						
						
						
					 
					
						2011-11-02 17:05:05 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							f97b3e5c56 
							
						 
					 
					
						
						
							
							bug 11858: fake pv :  use version in host parameter instead, fix XCP override  
						
						... 
						
						
						
						status 11858: resolved fixed
commit-by: Kevin Brooks
review-by: Anthony Xu 
						
						
					 
					
						2011-11-01 19:51:06 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							3067a9d2db 
							
						 
					 
					
						
						
							
							Swift : add two new files  
						
						
						
						
					 
					
						2011-10-21 14:26:20 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							c97010a160 
							
						 
					 
					
						
						
							
							BackupSnapshot to Swift  
						
						
						
						
					 
					
						2011-10-18 18:11:09 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							6710f09ab4 
							
						 
					 
					
						
						
							
							swift is written in python 2.6  
						
						... 
						
						
						
						make swift client work in python 2.4
changes:
1. md5 interface changed
2. urlparse interface changed
3. Queue interface changed 
						
						
					 
					
						2011-10-13 12:07:09 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							01d38fbb3e 
							
						 
					 
					
						
						
							
							add swift client from 1.4.3  
						
						
						
						
					 
					
						2011-10-13 11:47:41 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							7ba15ce49b 
							
						 
					 
					
						
						
							
							remove old swift client  
						
						
						
						
					 
					
						2011-10-12 12:11:46 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							1c5adc7714 
							
						 
					 
					
						
						
							
							bug 11336: compression to allow number of cidrs to scale beyond 8k  
						
						
						
						
					 
					
						2011-10-06 17:56:59 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							1b3372e1de 
							
						 
					 
					
						
						
							
							bug 11625: separate out error paths to enable fine grained error handling and cleanup  
						
						... 
						
						
						
						status 11625: resolved fixed 
						
						
					 
					
						2011-10-06 17:55:29 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							61fa7d8675 
							
						 
					 
					
						
						
							
							bug 11420: reduce duration of disruption  
						
						
						
						
					 
					
						2011-10-06 17:55:21 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							89e45bd671 
							
						 
					 
					
						
						
							
							bug 11130: Add GetDomRVersionCmd  
						
						
						
						
					 
					
						2011-09-29 14:50:11 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							9730160e63 
							
						 
					 
					
						
						
							
							typo  
						
						
						
						
					 
					
						2011-09-14 20:39:57 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							3549067d55 
							
						 
					 
					
						
						
							
							bug 11307: Add BumpUpPriorityCommand  
						
						
						
						
					 
					
						2011-09-14 16:22:19 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							d6cbd2b6bc 
							
						 
					 
					
						
						
							
							bug 11275:  
						
						... 
						
						
						
						remove heartbeat entry for this Primary Storage, when put this Primary Storage into maintenance mode
create heartbeat entry for this Primary Storage, when cancal maintenance for this Primary Storage
status 11275: resolved fixed 
						
						
					 
					
						2011-09-13 22:15:21 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							0aeb45fafc 
							
						 
					 
					
						
						
							
							if sequence number increases but signature does not change, do not reprogram, but rewrite the rule log  
						
						
						
						
					 
					
						2011-09-12 18:20:23 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							53970c89dc 
							
						 
					 
					
						
						
							
							Revert "bug 10617: blocking between security groups for egress rules fixed."  
						
						... 
						
						
						
						revert pending review
This reverts commit 7d30dfd79e3c4b01492f606333c26e36bcdc5d13. 
						
						
					 
					
						2011-09-12 14:45:58 -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 
						 
				 
			
				
					
						
							
							
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							10d2ca8d0a 
							
						 
					 
					
						
						
							
							bug 10617: blocking between security groups for egress rules fixed.  
						
						
						
						
					 
					
						2011-09-02 16:17:08 +05:30 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							7621dea575 
							
						 
					 
					
						
						
							
							Fix the regression on security group cleanup:  
						
						... 
						
						
						
						In pre-2.2.10, the cleanup doens't work at all.
In 2.2.10, it works but make a mistake to delete all the rules for vmname ending with "-untagged" 
						
						
					 
					
						2011-08-31 10:45:52 -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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							e4162e5be6 
							
						 
					 
					
						
						
							
							fixed the script  
						
						
						
						
					 
					
						2011-08-16 15:24:34 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							cd57e03e1d 
							
						 
					 
					
						
						
							
							fixed the script  
						
						
						
						
					 
					
						2011-08-16 15:23:53 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							2cea330540 
							
						 
					 
					
						
						
							
							fixed script  
						
						
						
						
					 
					
						2011-08-16 15:19:32 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							3802426ae3 
							
						 
					 
					
						
						
							
							Revert " fixed script"  
						
						... 
						
						
						
						This reverts commit 90ac340d39ead1f31c11449671a1aec4fd6f27e2. 
						
						
					 
					
						2011-08-16 15:18:20 -07:00