Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							1b2b369ecb 
							
						 
					 
					
						
						
							
							Merge latest master into javelin  
						
						 
						
						
						
						
					 
					
						2013-01-31 11:34:49 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							cae89c61f5 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://git-wip-us.apache.org/repos/asf/incubator-cloudstack  
						
						 
						
						
						
						
					 
					
						2013-01-31 20:39:53 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							5d8e1f0dff 
							
						 
					 
					
						
						
							
							Enabling Egress Rules Feature on the UI  
						
						 
						
						
						
						
					 
					
						2013-01-31 20:39:09 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							1b922e816c 
							
						 
					 
					
						
						
							
							Revert "CS-15922 : to avoid race condition when expunge vm, expunge interval and expunge deplay should be larger than 600 second"  
						
						 
						
						... 
						
						
						
						Reverted as per discussion at http://s.apache.org/NOm 
This reverts commit 5060f98268090be1c5fdde14055480c5d18a8a6b.
Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-01-31 18:15:41 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							3cbce11b78 
							
						 
					 
					
						
						
							
							Fixing a label in network offering  
						
						 
						
						
						
						
					 
					
						2013-01-31 18:01:42 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							e06a8569a2 
							
						 
					 
					
						
						
							
							propagate storagetype fix from commit e49b3b to diskOffering  
						
						 
						
						... 
						
						
						
						Author: Prasanna Santhanam <tsp@apache.org>
Date:   Sun Dec 9 23:13:24 2012 -0800
    marvin: storagetype reference only when attr present
    reference the storagetype only when present. storagetype is reqd
    only for devcloud style tests
Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-01-31 16:03:43 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Tomechak 
							
						 
					 
					
						
						
						
						
							
						
						
							9b05d55515 
							
						 
					 
					
						
						
							
							Docs. CLOUDSTACK-192. Remove documentation on XenServer hotfix notification, as the feature was not approved for inclusion in this release.  
						
						 
						
						
						
						
					 
					
						2013-01-30 22:15:33 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							b6727e5646 
							
						 
					 
					
						
						
							
							CLOUDSTACK-299: Egress firewall rules feature for guest network on VR  
						
						 
						
						
						
						
					 
					
						2013-01-31 11:20:47 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							48fdc25daa 
							
						 
					 
					
						
						
							
							CLOUDSTACK-299: Egress firewall rules feature for guest network on VR  
						
						 
						
						
						
						
					 
					
						2013-01-31 10:57:30 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							3c75d53f2f 
							
						 
					 
					
						
						
							
							more change to fix awsapi deployment with maven and jetty and Spring  
						
						 
						
						
						
						
					 
					
						2013-01-30 18:16:45 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							ae3d8aa018 
							
						 
					 
					
						
						
							
							rat: Fix apache license  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-30 17:44:41 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							d7ad2da7e0 
							
						 
					 
					
						
						
							
							server: Fix network refactor regressions for CLOUDSTACK-297  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-30 17:33:53 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							b21595c10d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-297: Reset SSH key to access VM  
						
						 
						
						... 
						
						
						
						This feature provides resetting a SSH key for an existing VM which means,
setting the old ssh key that is assigned to the VM previously with the new ssh
key.
Signed-off-by: Harikrishna Patnala <harikrishna.patnala@citrix.com>
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-30 17:33:44 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							526bb01b04 
							
						 
					 
					
						
						
							
							Fix awsapi issues in Spring wiring  
						
						 
						
						
						
						
					 
					
						2013-01-30 16:43:40 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							15906c03ca 
							
						 
					 
					
						
						
							
							Summary: add/remove/update default nics feature  
						
						 
						
						... 
						
						
						
						Description: Adds API calls updateDefaultNicForVirtualMachine,
addNicToVirtualMachine, and removeNicFromVirtualMachine. These are
intended to allow a user to modify a VM's configuration post
deployment, to adjust the networks to which the VM belongs.
BUG-ID: CLOUDSTACK-645
Submitted-by: Brian Angus <blangus@betterservers.com>
Submitted-by: Ryan Dietrich <ryan@betterservers.com>
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1359494800 -0700 
						
						
					 
					
						2013-01-30 17:43:21 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							99556a4f30 
							
						 
					 
					
						
						
							
							CLOUDSTACK-617: Unable to edit a sub-domain. Change UpdateDomain to be consistent with CreateDomain i.e. before this operation, while checking if the domain-name is unique, search under the parent domain instead of searching under the ROOT domain.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-30 16:40:48 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Tomechak 
							
						 
					 
					
						
						
						
						
							
						
						
							697d4d8832 
							
						 
					 
					
						
						
							
							Docs. CLOUDSTACK-192. Documentation for XenServer hotfix notification. In admin-alerts.xml, add new section "XenServer Hotfix Notification."  
						
						 
						
						
						
						
					 
					
						2013-01-30 16:37:54 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Tomechak 
							
						 
					 
					
						
						
						
						
							
						
						
							954343a1fc 
							
						 
					 
					
						
						
							
							Docs. CLOUDSTACK-297. Documentation for reset SSH key feature. In using-sshkeys.xml, add new section "Resetting SSH Keys."  
						
						 
						
						
						
						
					 
					
						2013-01-30 16:37:52 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Tomechak 
							
						 
					 
					
						
						
						
						
							
						
						
							bf4e217165 
							
						 
					 
					
						
						
							
							Docs. CLOUDSTACK-304. New section: snapshot-throttling.xml. In working-with-snapshots.xml: include the new section.  
						
						 
						
						
						
						
					 
					
						2013-01-30 16:37:51 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Tomechak 
							
						 
					 
					
						
						
						
						
							
						
						
							7dbbdd59c7 
							
						 
					 
					
						
						
							
							Docs. CLOUDSTACK-737. Documentation for security groups in advanced zones. In about-security-groups.xml, add 1 sentence: "In advanced zones, security groups are supported only on the KVM hypervisor." This replaces a sentence that states they are supported only in basic zones. New section: security-groups-advanced-zones.xml. In security-groups.xml: include the new section.  
						
						 
						
						
						
						
					 
					
						2013-01-30 16:37:49 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							397b5b5829 
							
						 
					 
					
						
						
							
							Removing the merge conflict statements from git.  
						
						 
						
						
						
						
					 
					
						2013-01-30 16:30:57 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							85aa3a9977 
							
						 
					 
					
						
						
							
							Revert "api: Include cloudstack-version in both xml and json api response"  
						
						 
						
						... 
						
						
						
						This reverts commit f8a483fc5a47cb66ac4788fcd7d53da0c9d6ea2b.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-30 16:12:21 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							4dc63f50a7 
							
						 
					 
					
						
						
							
							Spring hack for Ec2RestServlet  
						
						 
						
						
						
						
					 
					
						2013-01-30 15:56:56 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							0f130e15c7 
							
						 
					 
					
						
						
							
							CLOUDSTACK-355: cloudstack UI - Infrastructure menu - restore total number of zone on UI since performance issue of listZones API has been fixed on server-side.  
						
						 
						
						
						
						
					 
					
						2013-01-30 15:42:02 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							176523254e 
							
						 
					 
					
						
						
							
							Improve component lifecycle management with system run-level concept  
						
						 
						
						
						
						
					 
					
						2013-01-30 15:21:02 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							da2e6461a6 
							
						 
					 
					
						
						
							
							Remove temporary hacking and use Official way to wire-up servlet with injection under Spring  
						
						 
						
						
						
						
					 
					
						2013-01-30 15:21:01 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							301c4413bc 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1054: When calling listDomains through the API do not restrict ADMIN users  
						
						 
						
						... 
						
						
						
						When an admin calls this command without the ID parameter do not set the domain's ID
to the ID where the admin is in, this prevents him from doing lookups. 
						
						
					 
					
						2013-01-30 15:48:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							1906f480d1 
							
						 
					 
					
						
						
							
							Corrected MPL 1.1 license name from 1.0 to 1.1 (this was a mistake I made when initially adding that license to the descriptor)  
						
						 
						
						... 
						
						
						
						Signed-off-by: Chip Childers <chip.childers@gmail.com> 
						
						
					 
					
						2013-01-30 09:32:02 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							3bd53b45e3 
							
						 
					 
					
						
						
							
							Updating the legal docs for packages, based on the latest whisker tool source.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Chip Childers <chip.childers@gmail.com> 
						
						
					 
					
						2013-01-30 09:32:02 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							68d13d7b07 
							
						 
					 
					
						
						
							
							Updated the copyright year in the descriptor.xml files  
						
						 
						
						... 
						
						
						
						Signed-off-by: Chip Childers <chip.childers@gmail.com> 
						
						
					 
					
						2013-01-30 09:32:02 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							1b39b0e908 
							
						 
					 
					
						
						
							
							fixing licensing headers  
						
						 
						
						
						
						
					 
					
						2013-01-29 23:45:11 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							1f7eaf3d61 
							
						 
					 
					
						
						
							
							CloudStack CLOUDSTACK-774  
						
						 
						
						... 
						
						
						
						Supporting kickstart in CloudStack baremetal
merge baremetal feature to master 
						
						
					 
					
						2013-01-29 17:19:57 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							867cb4aa81 
							
						 
					 
					
						
						
							
							CLOUDSTACK-537: cloudstack UI - Advanced SG-enabled zone - VM Wizard - step 5 - when total number of selected sg networks is greater than 0 and total number of selected networks is greater than 1, pop up client-side validation error message "Can't create a vm with multiple networks one of which is Security Group enabled".  
						
						 
						
						
						
						
					 
					
						2013-01-29 16:44:58 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							c02801b7b7 
							
						 
					 
					
						
						
							
							CLOUDSTACK-537: cloudstack UI - Advanced SG-enabled zone - VM Wizard - fix a bug that networkID was not passed to API call when selected networks don't include security group service.  
						
						 
						
						
						
						
					 
					
						2013-01-29 16:41:14 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							1e0709d16d 
							
						 
					 
					
						
						
							
							maven: fix axis2 version to 1.5.6 fixes starting issue with awsapi  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-29 14:02:40 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							f8e1f5928f 
							
						 
					 
					
						
						
							
							UI list view: Fix overflow  
						
						 
						
						... 
						
						
						
						Removing 'ellipses' effect for long list view values. They are
rendering in too many cases, making the data hard to read. Reverting
back to using standard word wrap for long table cells. 
						
						
					 
					
						2013-01-29 12:17:17 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							85de14f6a4 
							
						 
					 
					
						
						
							
							Increase sleep time to allow token expire to account for windows  
						
						 
						
						... 
						
						
						
						environment clock issue. 
						
						
					 
					
						2013-01-29 11:19:09 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							1c20c80cb5 
							
						 
					 
					
						
						
							
							Fix unit test failure only on Windows environment.  
						
						 
						
						
						
						
					 
					
						2013-01-29 11:09:06 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							74efaada27 
							
						 
					 
					
						
						
							
							Missing quotes in libvirt configuration instructions. Thanks to  Nux! <nux@li.nux.ro> for finding the issue  
						
						 
						
						
						
						
					 
					
						2013-01-29 13:50:11 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							ca7b8b0a87 
							
						 
					 
					
						
						
							
							Package the usage server  
						
						 
						
						
						
						
					 
					
						2013-01-29 16:23:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							cc9110d7a1 
							
						 
					 
					
						
						
							
							We need these system libs to be present  
						
						 
						
						
						
						
					 
					
						2013-01-29 16:23:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							3b52249417 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://git-wip-us.apache.org/repos/asf/incubator-cloudstack  
						
						 
						
						
						
						
					 
					
						2013-01-29 14:33:55 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							cd10b994ae 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1082:UI doesn't throw any error message when trying to delete ip range from a network that is in use  
						
						 
						
						
						
						
					 
					
						2013-01-29 14:32:55 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							482ce5fe07 
							
						 
					 
					
						
						
							
							Summary: Account for embedded nics (e.g. 'em0') when looking for physical nic  
						
						 
						
						... 
						
						
						
						Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 
						
						
					 
					
						2013-01-28 21:21:30 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							cb8705c756 
							
						 
					 
					
						
						
							
							cli: Pygments based output in cloudmonkey and new cfg processing  
						
						 
						
						... 
						
						
						
						- Pygments based colored output for tabular and normal list outputs
- Fix cfg processing as per new cfg paths and ds
- Get rid of clint and old way of parsing and color printing
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-28 17:59:37 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							233c0adcf3 
							
						 
					 
					
						
						
							
							cli: Fix common.py's cfg fields grouped under similarites like ui, core, user etc.  
						
						 
						
						... 
						
						
						
						Changes config path to ~/.cloudmonkey this will break cfg path but all configs are
still backward compatible. We need folder to put a lot of stuff that is coming
for ex. themes and plugins
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-28 17:52:40 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							0720d25e12 
							
						 
					 
					
						
						
							
							cli: Get rid of clint, use Pygments  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-28 17:51:34 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							ad3692cbba 
							
						 
					 
					
						
						
							
							cli: Add pygments based lexical output processing  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-28 17:48:49 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							b5deb52fba 
							
						 
					 
					
						
						
							
							Put a tempoary fix to awsapi to workaround an issue with jetty/Spring integration limitation  
						
						 
						
						
						
						
					 
					
						2013-01-28 17:45:16 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							8887f01b37 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1070: HypervisorTemplateAdapter needs to be configured with proper name  
						
						 
						
						
						
						
					 
					
						2013-01-28 17:12:41 -08:00