kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							7026822e20 
							
						 
					 
					
						
						
							
							Fixed unittest build failure  
						
						 
						
						
						
						
					 
					
						2012-07-30 15:15:47 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							e87147de2e 
							
						 
					 
					
						
						
							
							fixed build failure  
						
						 
						
						
						
						
					 
					
						2012-07-30 13:55:12 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							894407caa9 
							
						 
					 
					
						
						
							
							rrq 5839: This table should not have a contraint on device and physical network id. This is dealt with in the code and by using the removed field.  
						
						 
						
						
						
						
					 
					
						2012-07-30 08:46:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							3313cc4a86 
							
						 
					 
					
						
						
							
							rrq 5834: fix for broken attachVolume command  
						
						 
						
						
						
						
					 
					
						2012-07-30 08:38:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Joe Brockmeier 
							
						 
					 
					
						
						
						
						
							
						
						
							3d866c4bbb 
							
						 
					 
					
						
						
							
							CS-15522 - fixing NFS settings to be less dangerous  
						
						 
						
						
						
						
					 
					
						2012-07-28 18:02:13 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								chip.childers@gmail.com 
							
						 
					 
					
						
						
						
						
							
						
						
							06b69ac2fe 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://git-wip-us.apache.org/repos/asf/incubator-cloudstack  
						
						 
						
						... 
						
						
						
						Conflicts:
	tools/devcloud/veewee/postinstall.sh 
						
						
					 
					
						2012-07-27 23:40:44 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								chip.childers@gmail.com 
							
						 
					 
					
						
						
						
						
							
						
						
							25e0cc9d75 
							
						 
					 
					
						
						
							
							Checkpoint commit - work in progress.  
						
						 
						
						... 
						
						
						
						Attempting to provide devcloud base box build process via veewee and
puppet provisining via Vagrant. 
						
						
					 
					
						2012-07-27 23:37:46 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							2943dc22d7 
							
						 
					 
					
						
						
							
							CS-15717: fail to delete the network when corresponding network elements fail to be destroyed  
						
						 
						
						
						
						
					 
					
						2012-07-27 23:37:46 -04: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							c894555924 
							
						 
					 
					
						
						
							
							setup: Add database upgrade for 3.0.3 to 4.0  
						
						 
						
						... 
						
						
						
						Also added a upgrade path from 3.X.X to 4.0, this should work. 
						
						
					 
					
						2012-07-27 23:37:46 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olgasmola 
							
						 
					 
					
						
						
						
						
							
						
						
							9c895b14ab 
							
						 
					 
					
						
						
							
							CS-15317: Fix operations with accounts on the Project tab after making another account project owner.  
						
						 
						
						
						
						
					 
					
						2012-07-27 23:37:46 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olgasmola 
							
						 
					 
					
						
						
						
						
							
						
						
							82bb1e5592 
							
						 
					 
					
						
						
							
							CS-15349: Fix incorrect result when Make owner in New project/Add account.  
						
						 
						
						
						
						
					 
					
						2012-07-27 23:37:46 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olgasmola 
							
						 
					 
					
						
						
						
						
							
						
						
							12c7fb3625 
							
						 
					 
					
						
						
							
							Fix build script typo.  
						
						 
						
						
						
						
					 
					
						2012-07-27 23:37:45 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olgasmola 
							
						 
					 
					
						
						
						
						
							
						
						
							0be4230f91 
							
						 
					 
					
						
						
							
							CS-15325: Fix selected name of user from the drop down list overlay.  
						
						 
						
						
						
						
					 
					
						2012-07-27 23:37:45 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olgasmola 
							
						 
					 
					
						
						
						
						
							
						
						
							9d67ecdbb7 
							
						 
					 
					
						
						
							
							CS-15518: Fix password field garbling on login screen.  
						
						 
						
						
						
						
					 
					
						2012-07-27 23:37:45 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							3f4e906b1d 
							
						 
					 
					
						
						
							
							agent: Remove cloud-cleanup.conf for Ubuntu  
						
						 
						
						... 
						
						
						
						This is a very dangerous file. Although we do not package it, it would be very dangerous to do so.
If this file would be present on a HyperVisor it would cause all instances to be stopped on a libvirt restart.
There is no need for stopping all instances when libvirt is being stopped (or restarted). 
						
						
					 
					
						2012-07-27 23:37:45 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							5789cd94a5 
							
						 
					 
					
						
						
							
							setup: Update 3.0.3 to 4.0.0 SQL update file  
						
						 
						
						... 
						
						
						
						I noticed that we have pending changes for the resource tags and Nicira integration.
Adding them as a precaution, so they don't get lost. 
						
						
					 
					
						2012-07-27 23:37:45 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							4dd2854d61 
							
						 
					 
					
						
						
							
							rbd: Small JavaScript fix  
						
						 
						
						
						
						
					 
					
						2012-07-27 23:37:45 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							dd50bdf38e 
							
						 
					 
					
						
						
							
							CS-15731: Make S2S VPN no-nat rule the top of POSTROUTING  
						
						 
						
						
						
						
					 
					
						2012-07-27 18:49:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							b410cbff5f 
							
						 
					 
					
						
						
							
							CS-15730: Prohibit create VPN connection from different gateway to same customer gateway  
						
						 
						
						
						
						
					 
					
						2012-07-27 17:41:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							e8ad5b7d01 
							
						 
					 
					
						
						
							
							CS-15555 : typo fix  
						
						 
						
						
						
						
					 
					
						2012-07-27 16:58:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							f44ce52b87 
							
						 
					 
					
						
						
							
							CS-15555 : typo  
						
						 
						
						
						
						
					 
					
						2012-07-27 16:56:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							1261f0c821 
							
						 
					 
					
						
						
							
							KVM  : fix, can boot user VM  
						
						 
						
						
						
						
					 
					
						2012-07-27 16:56:39 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							0021192b05 
							
						 
					 
					
						
						
							
							KVM fix  
						
						 
						
						
						
						
					 
					
						2012-07-27 16:54:05 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							3c90fc842f 
							
						 
					 
					
						
						
							
							CS-15704: Fix wrong domain id setting of non-root domain  
						
						 
						
						
						
						
					 
					
						2012-07-27 16:28:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							fd9ef34a0f 
							
						 
					 
					
						
						
							
							CS-15719: Fix state change when stopping  
						
						 
						
						
						
						
					 
					
						2012-07-27 16:28:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							8eee8f342e 
							
						 
					 
					
						
						
							
							S2S VPN: CS-15650: Add connection status update to s2s vpn  
						
						 
						
						
						
						
					 
					
						2012-07-27 16:28:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							786d5995df 
							
						 
					 
					
						
						
							
							S2S VPN: Add list function for normal users  
						
						 
						
						
						
						
					 
					
						2012-07-27 16:27:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							736c4c1510 
							
						 
					 
					
						
						
							
							CS-15670: Allow normal users to configure S2S VPN  
						
						 
						
						
						
						
					 
					
						2012-07-27 16:27:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							72a4b2f410 
							
						 
					 
					
						
						
							
							S2S VPN: Add name field for customer gateway  
						
						 
						
						... 
						
						
						
						Easier for user to identify the correct gateway 
						
						
					 
					
						2012-07-27 16:27:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							2fc1dc0df6 
							
						 
					 
					
						
						
							
							VPC : vpc integration code for XenServer hypervisor  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:54:30 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							dabd85e153 
							
						 
					 
					
						
						
							
							CS-15717: fail to delete the network when corresponding network elements fail to be destroyed  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:33:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							d5d6c9f5f4 
							
						 
					 
					
						
						
							
							VPC : this is default iptables for vpc route  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:04:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							0369fa3101 
							
						 
					 
					
						
						
							
							VCP : for each network,  there will be a seperate config file deriving from this one  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:04:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							59937838e5 
							
						 
					 
					
						
						
							
							VPC : create/destroy static nat  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:04:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							ae579c4cdd 
							
						 
					 
					
						
						
							
							VPC : create/destroy static route  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:04:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							0d52ac205b 
							
						 
					 
					
						
						
							
							VPC : create/destroy source NAT  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:04:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							9910176d76 
							
						 
					 
					
						
						
							
							VPC : create/destroy private Gateway  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:04:41 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							f7da1772b0 
							
						 
					 
					
						
						
							
							VPC : portforwarding script  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:04:41 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							952da87e19 
							
						 
					 
					
						
						
							
							VPC : basic network usage per guest network  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:04:41 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							744bfdce5f 
							
						 
					 
					
						
						
							
							VPC : vpc loadbalancer script  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:04:41 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							7dc4231ea6 
							
						 
					 
					
						
						
							
							VPC : vpc ip assocate fix  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:04:41 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							165a21c62a 
							
						 
					 
					
						
						
							
							VPC : vpc_acl.sh is for VPC access control list  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:04:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							05dc92c02c 
							
						 
					 
					
						
						
							
							VPC : remove all rules for a plugged nic device  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:04:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							599dcb49d5 
							
						 
					 
					
						
						
							
							VPC : add vpc_func.sh  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:04:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							5edb646be2 
							
						 
					 
					
						
						
							
							VPC : ipassoc.sh typo fix  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:04:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							7fd73fc5ab 
							
						 
					 
					
						
						
							
							VPC : add vpc_guestnw.sh  
						
						 
						
						
						
						
					 
					
						2012-07-27 15:04:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							fe2681fa10 
							
						 
					 
					
						
						
							
							VPC: CS-15725 - don't allow regular offering upgrade to the offering that can be used inside vpc only  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java 
						
						
					 
					
						2012-07-27 13:59:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							807a9ed2c3 
							
						 
					 
					
						
						
							
							VPC: added global configuration for limiting number of networks per vpc (vpc.max.networks)  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/vpc/VpcManagerImpl.java 
						
						
					 
					
						2012-07-27 13:56:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							190329286c 
							
						 
					 
					
						
						
							
							VPC:  
						
						 
						
						... 
						
						
						
						1) CS-15692 - ipAddress is always null for NetworkACL rule
2) CS-15699 - redundant router = true when provider is VirtualRouter
3) CS-15701 - fixed error message
Conflicts:
	server/src/com/cloud/network/vpc/VpcManagerImpl.java 
						
						
					 
					
						2012-07-27 13:55:39 -07:00