Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							6e7ad8830f 
							
						 
					 
					
						
						
							
							bug 11043: Propagating fix  
						
						 
						
						
						
						
					 
					
						2011-08-11 10:30:03 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							6b9603bc4c 
							
						 
					 
					
						
						
							
							bug 10561: intermidiate checkin for FirewallRuleFeature  
						
						 
						
						... 
						
						
						
						1) Added new apis: createFirewallRule, deleteFirewallRule, listFirewallRules
2) Modified existing apis - added boolean openFirewall parameter to createPortForwardingRule/createIpForwardingRule/createRemoteAccessVpn. If parameter is set to true, open firewall on the domR before creating an actual PF rule there
Modified backend calls appropriately.
3) Schema changes for firewall_rules table:
* startPort/endPort can be null now
* added icmp_type, icmp_code fields (can be not null only when protocol is icmp)
4) Added new manager - FirewallManagerImpl
Conflicts:
	api/src/com/cloud/api/BaseCmd.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java 
						
						
					 
					
						2011-08-09 15:51: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							e4a1d491c1 
							
						 
					 
					
						
						
							
							bug 10976: NPE fix to avoid blocking shutdown process  
						
						 
						
						
						
						
					 
					
						2011-08-05 14:10:15 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							37dcec77bb 
							
						 
					 
					
						
						
							
							Bug 10197:  
						
						 
						
						... 
						
						
						
						implement pool-wise VM sync,
    For XenServer, VM fullSync is pool-wise now, VM deltaSync is still per host
Conflicts:
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java 
						
						
					 
					
						2011-08-02 17:31:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							316ed91542 
							
						 
					 
					
						
						
							
							Bug 10860 - PremiumUpgrade is not run when upgrading to 2.2.8 (edit)  
						
						 
						
						... 
						
						
						
						run checker before any component loaded 
						
						
					 
					
						2011-07-29 20:22:39 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							262e6784e5 
							
						 
					 
					
						
						
							
							Bug 10860 - PremiumUpgrade is not run when upgrading to 2.2.8  
						
						 
						
						... 
						
						
						
						Use a new target "system-integrity-checker" in components.xml/components-premium.xml.
All checkers must be explicitly specified in XML file, they will execute before any components load
status 10860: resolved fixed 
						
						
					 
					
						2011-07-27 17:41:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							7d914666b4 
							
						 
					 
					
						
						
							
							Update fail-safe keystore with RSA private key  
						
						 
						
						
						
						
					 
					
						2011-07-25 18:55:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							4d20d21c95 
							
						 
					 
					
						
						
							
							Generate keystore using RSA rather than DSA  
						
						 
						
						... 
						
						
						
						Also fix a typo. 
						
						
					 
					
						2011-07-25 18:23:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							69d928b3d1 
							
						 
					 
					
						
						
							
							Make all connections READ COMMITTED isolation level instead of setting it everytime we get the db connection causing useless round trips  
						
						 
						
						
						
						
					 
					
						2011-07-23 15:03:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							66713a490d 
							
						 
					 
					
						
						
							
							fixed problem with the standalone connection has open transaction  
						
						 
						
						
						
						
					 
					
						2011-07-22 11:25:43 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							be3683306e 
							
						 
					 
					
						
						
							
							bug 10759: fixed the bug in SqlGenerator - attributes weren't set right if GENERIC.DAO.REMOVED attribute was present in the list (happened for disk and service offerings)  
						
						 
						
						... 
						
						
						
						status 10759: resolved fixed 
						
						
					 
					
						2011-07-21 18:49:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							950b53eea9 
							
						 
					 
					
						
						
							
							more db connection controls through jmx  
						
						 
						
						
						
						
					 
					
						2011-07-19 09:27:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							5590cd93ce 
							
						 
					 
					
						
						
							
							bug 10716: Changed the connection's isolation level to allow for more concurrency  
						
						 
						
						
						
						
					 
					
						2011-07-18 16:32:12 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							d925aa32e5 
							
						 
					 
					
						
						
							
							bug 10714: Implement packet fragmentation  
						
						 
						
						... 
						
						
						
						Also add an simple nio unit test.
status 10714: resolved fixed 
						
						
					 
					
						2011-07-15 19:35:56 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							3d41105e1b 
							
						 
					 
					
						
						
							
							From Alex - assertion fix  
						
						 
						
						
						
						
					 
					
						2011-07-15 10:19:27 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							161b7f1cad 
							
						 
					 
					
						
						
							
							Switched ping to use the same db connection so that running out of db connections won't affect basic operations  
						
						 
						
						
						
						
					 
					
						2011-07-14 10:48:07 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							1979d1d065 
							
						 
					 
					
						
						
							
							bug 10681: for serviceOfferings, diskOfferings, templates/isos return records with not null Removed field on findById method call  
						
						 
						
						... 
						
						
						
						status 10681: resolved fixed
Conflicts:
	server/src/com/cloud/server/ManagementServerImpl.java 
						
						
					 
					
						2011-07-13 18:25:13 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							8ef86467ed 
							
						 
					 
					
						
						
							
							more logging and fixed bug in cleanup  
						
						 
						
						
						
						
					 
					
						2011-07-13 09:53:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							6d3e30f16c 
							
						 
					 
					
						
						
							
							Move disconnect log to TRACE level  
						
						 
						
						
						
						
					 
					
						2011-07-11 11:09:19 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							6a23846a8d 
							
						 
					 
					
						
						
							
							Fix keystore loading path  
						
						 
						
						
						
						
					 
					
						2011-07-11 10:59:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							ccc12793c6 
							
						 
					 
					
						
						
							
							SSL: Fix leaking file descriptor  
						
						 
						
						... 
						
						
						
						And bad connection fail handling. 
						
						
					 
					
						2011-07-08 22:17:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							5b122e3669 
							
						 
					 
					
						
						
							
							connection conierge to deal with connections that are not returned to pools  
						
						 
						
						
						
						
					 
					
						2011-07-08 18:04:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							ea48d40e5f 
							
						 
					 
					
						
						
							
							connection conierge to deal with connections that are not returned to pools  
						
						 
						
						
						
						
					 
					
						2011-07-08 18:04:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							ee2670edc7 
							
						 
					 
					
						
						
							
							Some operations on the lock table allowed through jmx  
						
						 
						
						
						
						
					 
					
						2011-07-06 16:10:18 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							cabba35280 
							
						 
					 
					
						
						
							
							bug 10548: This problem is actually still a running out of db connection problem.  However, it points out a weakness in the Merovingian2 design.  It should keep a database connection for itself.  I originally intended to have that after writing the first edition but got distracted and didn't finish.  Here in the new implementation, Merovingian2 allocates a database connection for itself and keeps it alive at 10 second intervals with a SELECT 1 to avoid the connection being considered as abandoned by the dbcp pool.  
						
						 
						
						
						
						
					 
					
						2011-07-03 19:17:05 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							f28a2b40a3 
							
						 
					 
					
						
						
							
							bug 10501: This is really Kelven's bug but I'll fix it for him anyways.  DAO code already have a way to extract the DB connection from a transaction that is stored in the TLS.  There's no real reason for the DAO code to add special semantics to use a different DB connection.  That can be done by simply switching the transaction before it even reached the dao code.  Think about it.  Why would anyone want to call one dao function, switch transaction, and then switch back.  The right thing is for the caller to switch transaction, call a series of dao codes, and switch it back.  That's the semantics I changed to.  By doing this, it also eliminates the number of debug messages in this bug.  
						
						 
						
						
						
						
					 
					
						2011-07-01 11:03:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							43252dd4de 
							
						 
					 
					
						
						
							
							bug 10322: Transaction is using the new Merovingian  
						
						 
						
						
						
						
					 
					
						2011-06-29 15:34:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							7a4af21f72 
							
						 
					 
					
						
						
							
							bug 10322: Transaction is using the new Merovingian  
						
						 
						
						
						
						
					 
					
						2011-06-29 15:34:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							fefc798197 
							
						 
					 
					
						
						
							
							bug 10322: better mannered merovingians  
						
						 
						
						
						
						
					 
					
						2011-06-29 12:03:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							687e9f6e67 
							
						 
					 
					
						
						
							
							bug 10322: arrival of the next generation Merovingians  
						
						 
						
						
						
						
					 
					
						2011-06-29 12:03:05 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							27809e651e 
							
						 
					 
					
						
						
							
							bug 10322: arrival of the next generation Merovingians  
						
						 
						
						
						
						
					 
					
						2011-06-29 12:02:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							0059dd0e57 
							
						 
					 
					
						
						
							
							bug 10480, 10494: NPE fix in VirtualMachineManagerImpl, move keystore upgrade sql to upgrade225to226.sql  
						
						 
						
						
						
						
					 
					
						2011-06-28 14:57:02 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							dc44a4fe6e 
							
						 
					 
					
						
						
							
							more jmx stuff  
						
						 
						
						
						
						
					 
					
						2011-06-28 01:17:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							8903801193 
							
						 
					 
					
						
						
							
							more jmx stuff  
						
						 
						
						
						
						
					 
					
						2011-06-28 01:17:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							89269069f9 
							
						 
					 
					
						
						
							
							Added JMX to Transaction  
						
						 
						
						
						
						
					 
					
						2011-06-28 01:17:46 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							791dd9777b 
							
						 
					 
					
						
						
							
							logging changes  
						
						 
						
						
						
						
					 
					
						2011-06-27 10:19:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							3da61e7c27 
							
						 
					 
					
						
						
							
							bug 9605: use CIDR from default interface  
						
						 
						
						
						
						
					 
					
						2011-06-23 17:47:20 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							f360576391 
							
						 
					 
					
						
						
							
							bug 10375: fixed a problem with build name  
						
						 
						
						
						
						
					 
					
						2011-06-22 16:47:52 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							05a2fb6957 
							
						 
					 
					
						
						
							
							faster implementation of the log renderer  
						
						 
						
						
						
						
					 
					
						2011-06-22 16:47:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							a963b477ee 
							
						 
					 
					
						
						
							
							build better names  
						
						 
						
						
						
						
					 
					
						2011-06-22 16:47:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							251552f679 
							
						 
					 
					
						
						
							
							propagate loggin fixes  
						
						 
						
						
						
						
					 
					
						2011-06-22 16:36:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							ba6dd6cfcd 
							
						 
					 
					
						
						
							
							Catch more exception  
						
						 
						
						
						
						
					 
					
						2011-06-22 14:45:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							345d747913 
							
						 
					 
					
						
						
							
							Add more _selector.close()  
						
						 
						
						... 
						
						
						
						Also add more log. 
						
						
					 
					
						2011-06-22 14:23:41 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							38ebac207b 
							
						 
					 
					
						
						
							
							bug 10375: Added logging for exception causes  
						
						 
						
						
						
						
					 
					
						2011-06-22 11:51:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							a698dbe513 
							
						 
					 
					
						
						
							
							some connection logging was missing  
						
						 
						
						
						
						
					 
					
						2011-06-21 14:43:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							9d1523e6d6 
							
						 
					 
					
						
						
							
							faster checks in the logging.  Also better description  
						
						 
						
						
						
						
					 
					
						2011-06-21 09:56:01 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							5771b35a7a 
							
						 
					 
					
						
						
							
							new log4j jar files and now the ability to get rid of the stupid cglib stack traces in our logs  
						
						 
						
						
						
						
					 
					
						2011-06-21 01:12:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							6eb9c428bb 
							
						 
					 
					
						
						
							
							SSL: Fix loop in when BUFFER_UNDERFLOW  
						
						 
						
						... 
						
						
						
						Add 10 times as limit, as well as add the missing count=-1 judgement. 
						
						
					 
					
						2011-06-20 18:38:14 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							a58d730e34 
							
						 
					 
					
						
						
							
							bug 10368: Print out the hash code of the db connection instead of the toString().  Changed the transaction in changeToStart() method to be of a shorter interval so it won't cause so many db connection exceptions  
						
						 
						
						
						
						
					 
					
						2011-06-20 16:31:32 -07:00