Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							b12aebefee 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-658 - Adding Scalevm command and XS related changes"  
						
						... 
						
						
						
						This reverts commit e0019eccd997d9b2b3ff9395bcd99f821f5121db. 
						
						
					 
					
						2013-03-04 23:32:52 +05:30 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							e0019eccd9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-658 - Adding Scalevm command and XS related changes  
						
						
						
						
					 
					
						2013-03-04 14:47:55 +05:30 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							cc81413931 
							
						 
					 
					
						
						
							
							CLOUDSTACK-724: add zone wide storage, createstoragepoolcmd doesn't need cluster/pod any more  
						
						
						
						
					 
					
						2013-02-26 23:16:17 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							8e360f342d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-724: add basic zone wide storage support, refactor storage allocator, need ui support  
						
						
						
						
					 
					
						2013-02-26 18:39:23 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							8cb5c00c26 
							
						 
					 
					
						
						
							
							CLOUDSTACK-416: Add XCP 1.6.x in XcpServerDiscoverer.java processConnect  
						
						... 
						
						
						
						Thanks to Devdeep for pointing this out.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit c7935a9ab69ae941270d60d22e812e86b5e9c896)
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-02-26 15:37:58 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							43183893bd 
							
						 
					 
					
						
						
							
							CLOUDSTACK-416: Add XCP 1.6.x as supported hypervisor  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-02-26 13:55:43 +05:30 
						 
				 
			
				
					
						
							
							
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							23e54bb0f4 
							
						 
					 
					
						
						
							
							Cloudstack-711: Cpu and Ram Overcommit Ratio.  
						
						
						
						
					 
					
						2013-02-22 17:31:06 +05:30 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							a22403edcd 
							
						 
					 
					
						
						
							
							squash changes into one giant patch  
						
						
						
						
					 
					
						2013-02-21 11:22:48 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							80d58b6c73 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-02-20 16:42:56 +05:30 
						 
				 
			
				
					
						
							
							
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							c94a75c0a6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-752: Removed 1 private gateway for VPC limitation.  
						
						... 
						
						
						
						Verified that more than 8 private gateways can be created. 
						
						
					 
					
						2013-02-19 14:15:02 +05:30 
						 
				 
			
				
					
						
							
							
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							cc2a3c5498 
							
						 
					 
					
						
						
							
							CLOUDSTACK-651: Removed 7 nics limitation for VR on XenServer  
						
						... 
						
						
						
						# of nics can be configured using global param xen.nics.max. Param defaults to 7
Added new param to upgrade schema. 
						
						
					 
					
						2013-02-18 20:30:03 +05:30 
						 
				 
			
				
					
						
							
							
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							9a12756ae4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-684 support vm snapshot  
						
						
						
						
					 
					
						2013-02-14 01:26:30 +08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							3a0c99b0a4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-710: CitrixResourceBase, if dest dir is not found, mkdir -m 700 -p  
						
						... 
						
						
						
						This is a security failsafe, so even if destination does not exist we mkdir the path
with 0700 permission. If path exists mkdir -m 700 -p won't do anything.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-02-13 22:45:32 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							770860aee4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-710: mkdir -p destination before scp-ing file in CitrixResourceBase  
						
						... 
						
						
						
						- Assumption is that mkdir is available on xen host
- We don't know what kind of file we're copying, dirs would have 0777 permission
  by default
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-02-11 16:39:16 +05:30 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							7bd8bec68a 
							
						 
					 
					
						
						
							
							Sync javelin with master up to 894cb8f7d9fc8b5561754a9fa541fef8f235148a  
						
						
						
						
					 
					
						2013-01-31 17:20:19 -08:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							5cb9df91a1 
							
						 
					 
					
						
						
							
							Merge branch 'ipv6'  
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/network/NetworkProfile.java 
						
						
					 
					
						2013-01-31 15:07:33 -08:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							1b2b369ecb 
							
						 
					 
					
						
						
							
							Merge latest master into javelin  
						
						
						
						
					 
					
						2013-01-31 11:34:49 -08:00 
						 
				 
			
				
					
						
							
							
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							b6727e5646 
							
						 
					 
					
						
						
							
							CLOUDSTACK-299: Egress firewall rules feature for guest network on VR  
						
						
						
						
					 
					
						2013-01-31 11:20:47 +05:30 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							176523254e 
							
						 
					 
					
						
						
							
							Improve component lifecycle management with system run-level concept  
						
						
						
						
					 
					
						2013-01-30 15:21:02 -08:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							8f66d266b3 
							
						 
					 
					
						
						
							
							IPv6: Enable VR's ability to provide DHCPv6 service  
						
						
						
						
					 
					
						2013-01-26 23:14:42 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							a18baf8c83 
							
						 
					 
					
						
						
							
							fix compile  
						
						
						
						
					 
					
						2013-01-25 10:24:25 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							6f5655cb03 
							
						 
					 
					
						
						
							
							generalize storage orchestration: DataObjectManager will handle all the object life cycle management  
						
						
						
						
					 
					
						2013-01-24 18:30:08 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							c921118c58 
							
						 
					 
					
						
						
							
							add image create test case  
						
						
						
						
					 
					
						2013-01-22 13:25:48 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							4fbecf15ec 
							
						 
					 
					
						
						
							
							add unit test back, primary storage life cycle is tested  
						
						
						
						
					 
					
						2013-01-21 17:01:00 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							b4988e86ab 
							
						 
					 
					
						
						
							
							add backedn code  
						
						
						
						
					 
					
						2013-01-21 16:59:50 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							4a9cf4b4a8 
							
						 
					 
					
						
						
							
							Merge branch 'javelin' of  https://git-wip-us.apache.org/repos/asf/incubator-cloudstack  into javelin  
						
						
						
						
					 
					
						2013-01-18 15:59:24 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							1283712d93 
							
						 
					 
					
						
						
							
							replace spring injection in nfssecondarystorage  
						
						
						
						
					 
					
						2013-01-18 15:10:08 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							10d9c019a9 
							
						 
					 
					
						
						
							
							All merge conflicts resolved  
						
						
						
						
					 
					
						2013-01-18 12:14:57 -08:00 
						 
				 
			
				
					
						
							
							
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							975021dda1 
							
						 
					 
					
						
						
							
							Summary: adding resizeVolume api call  
						
						... 
						
						
						
						Detail: This merges the resizevolume feature branch, which provides the
ability to migrate a disk between disk offerings, thereby changing its
size, or specifying a new size if current disk offering is custom.
BUG-ID: CLOUDSTACK-644
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358358209 -0700 
						
						
					 
					
						2013-01-16 17:43:35 -07:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							2be270de89 
							
						 
					 
					
						
						
							
							Separate loadable components like Gurus, Elements, Adapters to componentContext.xml  
						
						
						
						
					 
					
						2013-01-16 16:33:59 -08:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							a6b9027630 
							
						 
					 
					
						
						
							
							default Security rule doesn't apply to system VMs since nic.getIsolationUri is not set  
						
						... 
						
						
						
						use to.setSecurityGroupEnabled to indicate if securitygroup is enabled on this NIC
CLOUDSTACK-983: default Security rule doesn't apply to system VMs 
						
						
					 
					
						2013-01-15 11:15:42 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							8af85b04d0 
							
						 
					 
					
						
						
							
							refactor api, based on suggestion from community  
						
						
						
						
					 
					
						2013-01-14 18:52:39 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							a03d83bba9 
							
						 
					 
					
						
						
							
							refactor the motion service api  
						
						
						
						
					 
					
						2013-01-10 10:27:05 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							cf8de7ee17 
							
						 
					 
					
						
						
							
							Removed all the .project files  
						
						
						
						
					 
					
						2013-01-08 14:11:00 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							30f2565d98 
							
						 
					 
					
						
						
							
							Merge branch 'api_refactoring' into javelin  
						
						
						
						
					 
					
						2013-01-08 12:36:04 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							9410cd1f3c 
							
						 
					 
					
						
						
							
							add deletevolume and createdata disk  
						
						
						
						
					 
					
						2013-01-03 18:56:18 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							9de3a1fae4 
							
						 
					 
					
						
						
							
							add create volume from base image command  
						
						
						
						
					 
					
						2012-12-27 16:31:59 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							d99161399e 
							
						 
					 
					
						
						
							
							so many traps in rpc call: you can't use aop in a thread, you need to intercept finalize call etc  
						
						
						
						
					 
					
						2012-12-24 02:37:32 -08:00 
						 
				 
			
				
					
						
							
							
								Devdeep Singh 
							
						 
					 
					
						
						
						
						
							
						
						
							8f6fdc3efc 
							
						 
					 
					
						
						
							
							CLOUDSTACK-227: Fix NPE and throw an exception if the network is not found in Xen  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-23 19:03:03 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							4b2d9f4415 
							
						 
					 
					
						
						
							
							refactor test cases: use testNG instead of junit, as testNG can group test cases and pass parameter to test case  
						
						
						
						
					 
					
						2012-12-22 22:10:39 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							ac88c16be6 
							
						 
					 
					
						
						
							
							finaly, finish download template to primary storage  
						
						
						
						
					 
					
						2012-12-20 19:06:02 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							c216990e1c 
							
						 
					 
					
						
						
							
							trying to add code to download url into devcloud  
						
						
						
						
					 
					
						2012-12-19 18:43:04 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							8214f18897 
							
						 
					 
					
						
						
							
							fix build, due to refactor rpc  
						
						
						
						
					 
					
						2012-12-19 12:02:11 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							0581ea763a 
							
						 
					 
					
						
						
							
							add xenserver backend code: download template from http directly  
						
						
						
						
					 
					
						2012-12-18 18:34:13 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							b70c1a5a84 
							
						 
					 
					
						
						
							
							Backs NFS-based secondary storage with an S3-compatible object store. Periodically, a reaper thread synchronizes templates and ISOs stored on a NFS secondary storage mount with a configured S3 object store. It also pushes snapshots to the object store when they are created and downloads them in other zones on-demand. In addition to permitting the use of commodity or IaaS storage solutions for static assets, it provides a means of automatically synchronizing template and ISO assets across multiple zones.  
						
						
						
						
					 
					
						2012-12-13 23:18:37 -08:00 
						 
				 
			
				
					
						
							
							
								Devdeep Singh 
							
						 
					 
					
						
						
						
						
							
						
						
							5405242674 
							
						 
					 
					
						
						
							
							master - Bug ID: CLOUDSTACK-369. Unable to add XenServer 6.1 to cloudstack. Created a new resource for XS 6.1. Also introduced a guest map for the list of supported os.  
						
						... 
						
						
						
						Signed-off-by: Devdeep Singh <devdeep.singh@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2012-12-10 15:17:07 +05:30 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							2b74b6e827 
							
						 
					 
					
						
						
							
							Start removing the old ant build files  
						
						... 
						
						
						
						Removed all build.xml files from the plugins 
						
						
					 
					
						2012-12-07 15:58:56 +01:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							40682fc43d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-587:  
						
						... 
						
						
						
						use setMemoryLimits instead 
						
						
					 
					
						2012-12-05 05:24:46 -08:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							cea8f3bf37 
							
						 
					 
					
						
						
							
							Switch inject annotation to javax and let ComponentLocator to recognize both the new and original inject annotation  
						
						
						
						
					 
					
						2012-11-07 15:03:22 -08:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							aab02e2743 
							
						 
					 
					
						
						
							
							Add Spring annotation to major components  
						
						
						
						
					 
					
						2012-11-07 14:53:39 -08:00