Chip Childers
							
						 
					 | 
					
						
						
						
						
							
						
						
							3a882fa17c
							
						
					 | 
					
						
						
							
							License header updates for the plugins folder.
						
						
						
						
						
						
					 | 
					
						2012-08-03 09:07:43 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alena Prokharchyk
							
						 
					 | 
					
						
						
						
						
							
						
						
							e0c85c0d41
							
						
					 | 
					
						
						
							
							VPC: replaced vmTo object with vmName parameter in plug/unplugNic commands
						
						
						
						
						
						
					 | 
					
						2012-08-01 18:19:03 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kelven Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							1aa4ed84b9
							
						
					 | 
					
						
						
							
							Merge VPC support in VMware integration
						
						
						
						
						
						
					 | 
					
						2012-08-01 17:27:59 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kishan
							
						 
					 | 
					
						
						
						
						
							
						
						
							9611a017e9
							
						
					 | 
					
						
						
							
							bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager
						
						
						
						
						
						
					 | 
					
						2012-07-27 23:37:46 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sheng Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							8eee8f342e
							
						
					 | 
					
						
						
							
							S2S VPN: CS-15650: Add connection status update to s2s vpn
						
						
						
						
						
						
					 | 
					
						2012-07-27 16:28:06 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alena Prokharchyk
							
						 
					 | 
					
						
						
						
						
							
						
						
							a39fd61249
							
						
					 | 
					
						
						
							
							Merge branch 'master' into vpc
						
						
						
						
						
						
						
						Conflicts:
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineGuru.java 
						
						
					 | 
					
						2012-07-27 13:47:46 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kishan
							
						 
					 | 
					
						
						
						
						
							
						
						
							468f2720eb
							
						
					 | 
					
						
						
							
							bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager
						
						
						
						
						
						
					 | 
					
						2012-07-27 23:13:18 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Edison Su
							
						 
					 | 
					
						
						
						
						
							
						
						
							764678f558
							
						
					 | 
					
						
						
							
							CS-15521 Xenserver based User VM failed to HA when vrouter runs on ESXi
						
						
						
						
						
						
						
						return false as an answer when executing PingTestCommand in
VMwareResource
RB:https://reviews.apache.org/r/5903/
Send-by: mice_xia@tcloudcomputing.com 
						
						
					 | 
					
						2012-07-26 10:43:33 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alena Prokharchyk
							
						 
					 | 
					
						
						
						
						
							
						
						
							6420ecbd6f
							
						
					 | 
					
						
						
							
							Merge branch 'master' into vpc
						
						
						
						
						
						
						
						Conflicts:
	server/src/com/cloud/server/ManagementServerImpl.java 
						
						
					 | 
					
						2012-07-24 16:13:06 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Edison Su
							
						 
					 | 
					
						
						
						
						
							
						
						
							576d093e9c
							
						
					 | 
					
						
						
							
							fix CS-15432 Failed to detach VMware tools ISO after VMware tools
						
						
						
						
						
						
						
						installation
RB: https://reviews.apache.org/r/5738/
Send-by: mice_xia@tcloudcomputing.com 
						
						
					 | 
					
						2012-07-24 13:44:55 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alena Prokharchyk
							
						 
					 | 
					
						
						
						
						
							
						
						
							353423acec
							
						
					 | 
					
						
						
							
							Merge branch 'master' into vpc
						
						
						
						
						
						
						
						Conflicts:
	api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
	api/src/com/cloud/api/response/FirewallResponse.java
	api/src/com/cloud/api/response/IPAddressResponse.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/dao/NetworkDaoImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java 
						
						
					 | 
					
						2012-07-06 12:04:10 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vijayendra Bhamidipati
							
						 
					 | 
					
						
						
						
						
							
						
						
							b957933a0e
							
						
					 | 
					
						
						
							
							Making nexus vsm password encryptable
						
						
						
						
						
						
					 | 
					
						2012-07-03 17:26:05 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alena Prokharchyk
							
						 
					 | 
					
						
						
						
						
							
						
						
							1f01d923ca
							
						
					 | 
					
						
						
							
							Merge branch 'master' into vpc
						
						
						
						
						
						
					 | 
					
						2012-06-28 17:44:08 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Murali reddy
							
						 
					 | 
					
						
						
						
						
							
						
						
							8197f1f07c
							
						
					 | 
					
						
						
							
							moving out VMWAre and Nexus VSM support code into plugins/hypervisors/vmware
						
						
						
						
						
						
					 | 
					
						2012-06-26 19:48:55 -07:00 | 
					
					
						
						
							
							
							
						
					 |