Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							1edf772f92 
							
						 
					 
					
						
						
							
							bug 10480, 10494: NPE fix in VirtualMachineManagerImpl, move keystore upgrade sql to upgrade225to226.sql  
						
						 
						
						
						
						
					 
					
						2011-06-28 15:00:34 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							2f391d2b9d 
							
						 
					 
					
						
						
							
							more jmx stuff  
						
						 
						
						
						
						
					 
					
						2011-06-28 01:17:10 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							90488eea7c 
							
						 
					 
					
						
						
							
							more jmx stuff  
						
						 
						
						
						
						
					 
					
						2011-06-27 18:26:30 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							b7e4298c94 
							
						 
					 
					
						
						
							
							Added JMX to Transaction  
						
						 
						
						
						
						
					 
					
						2011-06-27 17:24:26 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							97b562fc2a 
							
						 
					 
					
						
						
							
							logging changes  
						
						 
						
						
						
						
					 
					
						2011-06-27 10:18:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							3b93d353d6 
							
						 
					 
					
						
						
							
							bug 9605: use CIDR from default interface  
						
						 
						
						
						
						
					 
					
						2011-06-23 17:48:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							ecd9fad89c 
							
						 
					 
					
						
						
							
							bug 10375: fixed a problem with build name  
						
						 
						
						
						
						
					 
					
						2011-06-22 16:43:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							129f40d0cb 
							
						 
					 
					
						
						
							
							bug 10375: trying to reduce the scope of the transaction  
						
						 
						
						
						
						
					 
					
						2011-06-22 16:34:14 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							252ca3f81a 
							
						 
					 
					
						
						
							
							build better names  
						
						 
						
						
						
						
					 
					
						2011-06-22 16:34:14 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							47f114ad96 
							
						 
					 
					
						
						
							
							faster implementation of the log renderer  
						
						 
						
						
						
						
					 
					
						2011-06-22 16:34:14 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							cba8e16b61 
							
						 
					 
					
						
						
							
							Catch more exception  
						
						 
						
						
						
						
					 
					
						2011-06-22 14:46:15 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							64b2293a50 
							
						 
					 
					
						
						
							
							Add more _selector.close()  
						
						 
						
						... 
						
						
						
						Also add more log. 
						
						
					 
					
						2011-06-22 14:24:12 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							573c054673 
							
						 
					 
					
						
						
							
							bug 10375: Added logging for exception causes  
						
						 
						
						
						
						
					 
					
						2011-06-22 11:51:35 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							0cf9d8b788 
							
						 
					 
					
						
						
							
							some connection logging was missing  
						
						 
						
						
						
						
					 
					
						2011-06-21 14:42:12 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							22d5eac400 
							
						 
					 
					
						
						
							
							new log4j  
						
						 
						
						
						
						
					 
					
						2011-06-21 10:15:21 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							da0379149a 
							
						 
					 
					
						
						
							
							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:36:35 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							e4f42d0e52 
							
						 
					 
					
						
						
							
							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 11:30:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							c9a58ba36e 
							
						 
					 
					
						
						
							
							added connection logging to check for db connection losses  
						
						 
						
						
						
						
					 
					
						2011-06-19 06:31:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							1561275838 
							
						 
					 
					
						
						
							
							bug 10260: propagate ha and deployment planner fixes  
						
						 
						
						
						
						
					 
					
						2011-06-13 17:35:34 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							1d7e70acd1 
							
						 
					 
					
						
						
							
							bug 10260: propagate ha and deployment planner fixes  
						
						 
						
						
						
						
					 
					
						2011-06-13 17:35:20 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							f93612df37 
							
						 
					 
					
						
						
							
							bug 10094: distinguish between no transition from one state to another vs there's a concurrent operation  
						
						 
						
						
						
						
					 
					
						2011-06-13 17:33:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							283a559f03 
							
						 
					 
					
						
						
							
							Changed disconnection messages to be logged at debug level because there's been various reports that agents are dropping connections.  This should help in figuring it out.  
						
						 
						
						
						
						
					 
					
						2011-06-13 11:40:04 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							cd7c74538b 
							
						 
					 
					
						
						
							
							bug 9697: encode api response values  
						
						 
						
						... 
						
						
						
						status 9697: resolved fixed
Do encoding for ASCII chars only (done to eliminate problems with multiple language support)
To disable encoding, set "encode.api.response" to false 
						
						
					 
					
						2011-06-10 17:45:15 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							9c72759007 
							
						 
					 
					
						
						
							
							bug 9651: update network working now  
						
						 
						
						
						
						
					 
					
						2011-06-09 11:54:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							575ac62926 
							
						 
					 
					
						
						
							
							bug 9651: propagating 3fd50fd8634958727f4c64c9d1fb7fa27e07e4c8  
						
						 
						
						
						
						
					 
					
						2011-06-08 15:58:01 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							ff86c865e2 
							
						 
					 
					
						
						
							
							bug 10135: Add SSL encryption for non-NIO link  
						
						 
						
						... 
						
						
						
						Now Link.write() support SSL encryption. And since there is no user of
Link.read(), we comment it out. 
						
						
					 
					
						2011-06-04 21:27:18 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							d9e0bcfa1e 
							
						 
					 
					
						
						
							
							bug 10126: Renamed getPodId() to getPodIdToDeployIn()  
						
						 
						
						
						
						
					 
					
						2011-06-03 22:17:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							2dbb8eb502 
							
						 
					 
					
						
						
							
							bug 9651: Make same VLAN work on two different nics  
						
						 
						
						
						
						
					 
					
						2011-06-01 17:07:44 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							8754f8fab8 
							
						 
					 
					
						
						
							
							bug 9651: checked in missing files  
						
						 
						
						
						
						
					 
					
						2011-05-31 10:27:50 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							7c74c3a51d 
							
						 
					 
					
						
						
							
							bug 9651: network tagging changes working now  
						
						 
						
						
						
						
					 
					
						2011-05-31 09:49:27 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							0ab12edd6c 
							
						 
					 
					
						
						
							
							network tagging changes  
						
						 
						
						
						
						
					 
					
						2011-05-31 09:49:27 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							67ff27496d 
							
						 
					 
					
						
						
							
							tags added  
						
						 
						
						
						
						
					 
					
						2011-05-31 09:48:34 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							0dfc44582b 
							
						 
					 
					
						
						
							
							bug 9651: Adding network tags  
						
						 
						
						... 
						
						
						
						Also changes in Request logging. 
						
						
					 
					
						2011-05-23 15:51:50 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							ea9703997b 
							
						 
					 
					
						
						
							
							proxy agent  
						
						 
						
						
						
						
					 
					
						2011-05-17 07:12:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							9c4964bc1b 
							
						 
					 
					
						
						
							
							fixed merge  
						
						 
						
						
						
						
					 
					
						2011-05-16 16:54:00 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							47380dc20e 
							
						 
					 
					
						
						
							
							fix add host  
						
						 
						
						
						
						
					 
					
						2011-05-12 15:03:15 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							0c1ad8ac88 
							
						 
					 
					
						
						
							
							Fix another "Too many open file open"  
						
						 
						
						... 
						
						
						
						Resources need to be released before creating new NioClient instance during the
reconnecting. 
						
						
					 
					
						2011-05-11 16:48:27 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							fe8d81e246 
							
						 
					 
					
						
						
							
							bug 9765: This is NOT an UI bug. This is a server-side bug. UI calls DeployVM API with ServiceOfferingID parameter (NOT ServiceOfferingDescription parameter). Then, server-side gets ServiceOfferingDescription by ServiceOfferingID and send it to DomR WITHTOUT escaping it first. DomR doesn't support full range of unicode character set. Therefore, DomR fails to accept metadata that has non-ascii code (error: "vm_data failed"). This check-in will send Unicode-escaped string of metadata "service-offering", "availability-zone" and "local-hostname" to DomR. Data Consumer of VM-data service needs to unescape the content accordingly.  
						
						 
						
						
						
						
					 
					
						2011-05-10 17:57:44 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							b2cf4e39ea 
							
						 
					 
					
						
						
							
							propagate fix from 2.2.4  
						
						 
						
						
						
						
					 
					
						2011-05-05 17:57:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							0138d06cf2 
							
						 
					 
					
						
						
							
							load user specified component specification from enviroment.properties: e.g. cloud-stack-components-specification=components-cloudzone.xml  
						
						 
						
						
						
						
					 
					
						2011-05-05 11:42:11 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							fba1c95512 
							
						 
					 
					
						
						
							
							bug 9615: Part of the HA cleanup  
						
						 
						
						
						
						
					 
					
						2011-05-03 16:34:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							cf05527ba8 
							
						 
					 
					
						
						
							
							merge from zonesfeature  
						
						 
						
						
						
						
					 
					
						2011-05-03 10:41:32 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							303e2a7481 
							
						 
					 
					
						
						
							
							Start of zonesfeature / mycloud/cloudkit  
						
						 
						
						
						
						
					 
					
						2011-05-03 10:40:17 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							99bc15f64a 
							
						 
					 
					
						
						
							
							changed getName to getHostname  
						
						 
						
						
						
						
					 
					
						2011-04-29 08:34:10 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							11ef6bbbe2 
							
						 
					 
					
						
						
							
							bug 9638: fixed bunch of DB upgrade bugs  
						
						 
						
						... 
						
						
						
						status 9638: resolved fixed
Conflicts:
	server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
	utils/src/com/cloud/utils/net/NetUtils.java 
						
						
					 
					
						2011-04-28 18:30:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							cf114fc7af 
							
						 
					 
					
						
						
							
							Enable SSL for mgmt servers and agents  
						
						 
						
						... 
						
						
						
						The port remains 8250.
The keystore saved at /etc/cloud/management/cloud.keystore. We also include one
fail-safe keystore/certificate for fallback if we are unable to generate
certificate and keystore. If we use fail-safe keystore, a warning and calltrace would be show.
Notice you need to upgrade agent, as well as systemVM's images. 
						
						
					 
					
						2011-04-28 17:41:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Frank 
							
						 
					 
					
						
						
						
						
							
						
						
							504eb25c37 
							
						 
					 
					
						
						
							
							Intrdouce adapter to template manager.  
						
						 
						
						
						
						
					 
					
						2011-04-27 14:04:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							81492dbe04 
							
						 
					 
					
						
						
							
							propagate searching local CIDR fix from 2.2.4 to master  
						
						 
						
						
						
						
					 
					
						2011-04-27 10:01:35 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							41e5e38fef 
							
						 
					 
					
						
						
							
							bug 9336: securityGroups can be used by other securityGroups in the same domain only; no cross domain SG authentication  
						
						 
						
						... 
						
						
						
						status 9336: resolved fixed
Following changes were made:
* deleteSecurityGroup/authorizeSecurityGroupIngress - removed account/domainId parameters as SG is uniquely identified by id now
* removed account_name field from securityGroup DB table; removed allowed_security_group/allowed_sec_grp_acct from security_ingress_rule.
These values were used for api response generation only for performance purposes; added caching on API level to improve performance
* Added missing security checks for securityGroups/ingressRules 
						
						
					 
					
						2011-04-22 11:35:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							565dfb9809 
							
						 
					 
					
						
						
							
							Add java keystore helper class, prepare for dynamically generating keystore for SSL use  
						
						 
						
						
						
						
					 
					
						2011-04-18 11:08:07 -07:00