Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							296b49c2f8 
							
						 
					 
					
						
						
							
							Merge branch 'master' into test-merge-api  
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/agent/api/BackupSnapshotCommand.java
	api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/resource/ResourceService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/storage/SnapshotVO.java
	pom.xml
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade40to41.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	setup/db/create-schema.sql
	setup/db/db/schema-40to410.sql
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-23 13:54:46 -08:00 
						 
				 
			
				
					
						
							
							
								Sebastien Goasguen 
							
						 
					 
					
						
						
						
						
							
						
						
							6507055ba1 
							
						 
					 
					
						
						
							
							Change in Dev Guide to add Maven and Tools Chapter  
						
						
						
						
					 
					
						2012-12-15 00:29:12 -06:00 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							b5eec20f5e 
							
						 
					 
					
						
						
							
							Revert "Docs for Elastic IP and display name in vCenter"  
						
						... 
						
						
						
						This reverts commit 41dd38c86b0ac3f2c235c06162a5c12cf930aa8e. 
						
						
					 
					
						2012-12-13 05:22:20 +05:30 
						 
				 
			
				
					
						
							
							
								Joe Brockmeier 
							
						 
					 
					
						
						
						
						
							
						
						
							561dccfe9d 
							
						 
					 
					
						
						
							
							Fixing an oops, left out a tag...  
						
						
						
						
					 
					
						2012-12-12 11:21:14 -06:00 
						 
				 
			
				
					
						
							
							
								Radhika PC 
							
						 
					 
					
						
						
						
						
							
						
						
							41dd38c86b 
							
						 
					 
					
						
						
							
							Docs for Elastic IP and display name in vCenter  
						
						
						
						
					 
					
						2012-12-13 04:05:49 +05:30 
						 
				 
			
				
					
						
							
							
								Sebastien Goasguen 
							
						 
					 
					
						
						
						
						
							
						
						
							400d29be85 
							
						 
					 
					
						
						
							
							Modify docs for transifex translation  
						
						
						
						
					 
					
						2012-12-09 11:30:18 -06:00 
						 
				 
			
				
					
						
							
							
								Sebastien Goasguen 
							
						 
					 
					
						
						
						
						
							
						
						
							18d7595292 
							
						 
					 
					
						
						
							
							Prepare docs for transifex translation  
						
						
						
						
					 
					
						2012-12-09 11:30:18 -06:00 
						 
				 
			
				
					
						
							
							
								Joe Brockmeier 
							
						 
					 
					
						
						
						
						
							
						
						
							2bd877616b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-400: documening procedure to update MySQL password. Also added a few xrefs in other documents that were missing them.  
						
						
						
						
					 
					
						2012-12-09 11:11:22 -06:00 
						 
				 
			
				
					
						
							
							
								Joe Brockmeier 
							
						 
					 
					
						
						
						
						
							
						
						
							9d6bdf9cf9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-389: Added language to clear up confusion about iSCSI only.  
						
						
						
						
					 
					
						2012-12-09 10:12:34 -06:00 
						 
				 
			
				
					
						
							
							
								Joe Brockmeier 
							
						 
					 
					
						
						
						
						
							
						
						
							ac50c2699c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-395: Added xrefs to about-primary-storage and about-secondary-storage  
						
						
						
						
					 
					
						2012-12-07 13:48:42 -06:00 
						 
				 
			
				
					
						
							
							
								Joe Brockmeier 
							
						 
					 
					
						
						
						
						
							
						
						
							3ab8a65a39 
							
						 
					 
					
						
						
							
							removing garbage files  
						
						
						
						
					 
					
						2012-12-07 08:49:18 -06:00 
						 
				 
			
				
					
						
							
							
								Joe Brockmeier 
							
						 
					 
					
						
						
						
						
							
						
						
							4fe6494881 
							
						 
					 
					
						
						
							
							CLOUDSTACK-480: Adding mention to install nfs-kernel-server to Install Guide  
						
						
						
						
					 
					
						2012-12-07 08:46:32 -06:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							6fc3bc3760 
							
						 
					 
					
						
						
							
							api_refactor: refactor vpn and vm apis  
						
						... 
						
						
						
						- Refactor VPN and VM APIs to admin and user pkgs
- Names space, org.apache.cloudstack
- Fix refactored apis in commands*.in
- Fix comments etc.
- Expand tabs, remove trailing whitespace
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-03 21:27:02 -08:00 
						 
				 
			
				
					
						
							
							
								Gavin Lee 
							
						 
					 
					
						
						
						
						
							
						
						
							df8990eae6 
							
						 
					 
					
						
						
							
							Rename cloudplatform-api.xml to cloudstack-api.xml  
						
						... 
						
						
						
						Change CloudPlatform to &PRODUCT; 
						
						
					 
					
						2012-11-28 12:45:54 +08:00 
						 
				 
			
				
					
						
							
							
								Sebastien Goasguen 
							
						 
					 
					
						
						
						
						
							
						
						
							45dd833b2e 
							
						 
					 
					
						
						
							
							CS-547  
						
						... 
						
						
						
						Signed-off-by: Gavin Lee <gavin.lxh@gmail.com> 
						
						
					 
					
						2012-11-28 10:21:17 +08:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							d15c506571 
							
						 
					 
					
						
						
							
							CLOUDSTACK-397 - removed image that wasn't conveying networking layout properly  
						
						
						
						
					 
					
						2012-11-16 18:50:45 -05:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							bd904df022 
							
						 
					 
					
						
						
							
							CLOUDSTACK-467 putting in the correct link to API documentation  
						
						
						
						
					 
					
						2012-11-16 18:08:02 -05:00 
						 
				 
			
				
					
						
							
							
								Gavin Lee 
							
						 
					 
					
						
						
						
						
							
						
						
							ddca805912 
							
						 
					 
					
						
						
							
							Docbook xml for additional installation options  
						
						
						
						
					 
					
						2012-11-09 13:55:27 +08:00 
						 
				 
			
				
					
						
							
							
								Joe Brockmeier 
							
						 
					 
					
						
						
						
						
							
						
						
							d8e31c7a90 
							
						 
					 
					
						
						
							
							Revised en-US/network-setup.xml to include the correct file.  
						
						
						
						
					 
					
						2012-11-08 00:12:28 -06:00 
						 
				 
			
				
					
						
							
							
								Joe Brockmeier 
							
						 
					 
					
						
						
						
						
							
						
						
							079de08194 
							
						 
					 
					
						
						
							
							Commented out missing file.  
						
						
						
						
					 
					
						2012-11-07 23:53:53 -06:00 
						 
				 
			
				
					
						
							
							
								Radhika PC 
							
						 
					 
					
						
						
						
						
							
						
						
							ffdf19dc2c 
							
						 
					 
					
						
						
							
							fix for review comments-cloudstack-403  
						
						... 
						
						
						
						Signed-off-by: Radhika PC <radhika.puthiyetath@citrix.com>
Signed-off-by: Joe Brockmeier <jzb@zonker.net> 
						
						
					 
					
						2012-11-07 23:13:27 -06:00 
						 
				 
			
				
					
						
							
							
								Radhika PC 
							
						 
					 
					
						
						
						
						
							
						
						
							5722827c1b 
							
						 
					 
					
						
						
							
							fix for cloudstack-403  
						
						... 
						
						
						
						Signed-off-by: Radhika PC <radhika.puthiyetath@citrix.com>
Signed-off-by: Joe Brockmeier <jzb@zonker.net> 
						
						
					 
					
						2012-11-07 23:11:09 -06:00 
						 
				 
			
				
					
						
							
							
								Radhika PC 
							
						 
					 
					
						
						
						
						
							
						
						
							cb3d8872c6 
							
						 
					 
					
						
						
							
							fix for CLOUDSTACK-444  
						
						... 
						
						
						
						Signed-off-by: Radhika PC <radhika.puthiyetath@citrix.com>
Signed-off-by: Joe Brockmeier <jzb@zonker.net> 
						
						
					 
					
						2012-11-07 11:40:51 -06:00 
						 
				 
			
				
					
						
							
							
								Jessica Tomechak 
							
						 
					 
					
						
						
						
						
							
						
						
							c2ccc52c4d 
							
						 
					 
					
						
						
							
							Docs. Remove inaccurate CloudStack software version number from table heading.  
						
						
						
						
					 
					
						2012-11-05 12:51:58 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Tomechak 
							
						 
					 
					
						
						
						
						
							
						
						
							514a7e31d4 
							
						 
					 
					
						
						
							
							Docs. CLOUDSTACK-134. Copying vhd-util is required only when XenServer is used.  
						
						
						
						
					 
					
						2012-11-05 12:51:56 -08:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							fe7b28ea0b 
							
						 
					 
					
						
						
							
							Summary: Fixed typo in the documentation, reported by Roeland Kuipers  
						
						
						
						
					 
					
						2012-11-05 15:23:48 +01:00 
						 
				 
			
				
					
						
							
							
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							4cb9e6d7d4 
							
						 
					 
					
						
						
							
							docs: Change filename of Deb repository file  
						
						... 
						
						
						
						These files should end with .list, otherwise Apt won't pick them up. 
						
						
					 
					
						2012-11-05 10:23:09 +01:00 
						 
				 
			
				
					
						
							
							
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							fb08e8b7e4 
							
						 
					 
					
						
						
							
							docs: Add RPM repository  
						
						... 
						
						
						
						The RPM packages are now also hosted on cloudstack.apt-get.eu
By adding this to the docs it makes life easier for people when installing.
Also replaced CloudStack by &PRODUCT; a couple of times 
						
						
					 
					
						2012-11-05 10:21:43 +01:00 
						 
				 
			
				
					
						
							
							
								Radhika PC 
							
						 
					 
					
						
						
						
						
							
						
						
							863306260a 
							
						 
					 
					
						
						
							
							fix for CLOUDSTACk-290:Reviewed:By-Jessica Tomechak  
						
						
						
						
					 
					
						2012-11-03 17:40:58 +05:30 
						 
				 
			
				
					
						
							
							
								Joe Brockmeier 
							
						 
					 
					
						
						
						
						
							
						
						
							7ffcd9e8bf 
							
						 
					 
					
						
						
							
							CLOUDSTACK-291 Additional comment on install.sh upgrade path: Noted that users need to agree to changes suggested by Yum or APT.  
						
						
						
						
					 
					
						2012-11-01 18:12:33 -05:00 
						 
				 
			
				
					
						
							
							
								Joe Brockmeier 
							
						 
					 
					
						
						
						
						
							
						
						
							dee9264ddc 
							
						 
					 
					
						
						
							
							CLOUDSTACK-385: Section 3.2.3 (MD5): confusing first sentence. Fixed this, though the entire section could probably do with a re-write. I think the existing instructions are overly complex.  
						
						
						
						
					 
					
						2012-11-01 17:49:03 -05:00 
						 
				 
			
				
					
						
							
							
								Joe Brockmeier 
							
						 
					 
					
						
						
						
						
							
						
						
							5ddb6f251c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-392: Install Guide - fixed issue with minor correction needed in docs.  
						
						
						
						
					 
					
						2012-11-01 17:44:08 -05:00 
						 
				 
			
				
					
						
							
							
								Joe Brockmeier 
							
						 
					 
					
						
						
						
						
							
						
						
							bb38462b4f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-250 minor fix in documentation about maintenance mode.  
						
						
						
						
					 
					
						2012-11-01 17:39:03 -05:00 
						 
				 
			
				
					
						
							
							
								Joe Brockmeier 
							
						 
					 
					
						
						
						
						
							
						
						
							f39cd83999 
							
						 
					 
					
						
						
							
							Minor doc cleanup.  
						
						
						
						
					 
					
						2012-10-31 17:53:56 -05:00 
						 
				 
			
				
					
						
							
							
								Jessica Tomechak 
							
						 
					 
					
						
						
						
						
							
						
						
							1e0b8e43ba 
							
						 
					 
					
						
						
							
							Docs. Fix CLOUDSTACK-405. Put missing steps back into management server installation. Running cloud-setup-management was missing. Also some copy edits.  
						
						
						
						
					 
					
						2012-10-23 16:20:57 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Tomechak 
							
						 
					 
					
						
						
						
						
							
						
						
							b1c72c1254 
							
						 
					 
					
						
						
							
							Docs. Fix bug CLOUDSTACK-406. Change AWS API port to 7080 in Installation Guide.  
						
						
						
						
					 
					
						2012-10-23 15:24:41 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Tomechak 
							
						 
					 
					
						
						
						
						
							
						
						
							6cb0c97fbc 
							
						 
					 
					
						
						
							
							Docs. Add missing sections to Primary Storage. Fix a typo.  
						
						
						
						
					 
					
						2012-10-23 14:37:30 -07:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							026b8d6209 
							
						 
					 
					
						
						
							
							fixing release notes name  
						
						
						
						
					 
					
						2012-10-22 12:22:08 -04:00 
						 
				 
			
				
					
						
							
							
								Joe Brockmeier 
							
						 
					 
					
						
						
						
						
							
						
						
							2999d438bf 
							
						 
					 
					
						
						
							
							Minor cleanup on VMware docs, remove v1000  
						
						
						
						
					 
					
						2012-10-22 09:22:15 -05:00 
						 
				 
			
				
					
						
							
							
								Gavin Lee 
							
						 
					 
					
						
						
						
						
							
						
						
							f1b8bce996 
							
						 
					 
					
						
						
							
							CLOUDSTACK-393:Docbook for VMWare vsphere installation  
						
						... 
						
						
						
						Signed-off-by: Gavin Lee <gavin.lxh@gmail.com> 
						
						
					 
					
						2012-10-22 09:26:21 -04:00 
						 
				 
			
				
					
						
							
							
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							59091fde33 
							
						 
					 
					
						
						
							
							CLOUDSTACK-376: Changes to the min sys reqs doc.  
						
						... 
						
						
						
						I had to manually apply the changes, due to a conflict when applying
https://reviews.apache.org/r/7661 .
The rest of the patch submitted via that review request was committed
in the previous master branch commit.
Signed-off-by: Chip Childers <chip.childers@gmail.com> 
						
						
					 
					
						2012-10-22 09:22:28 -04:00 
						 
				 
			
				
					
						
							
							
								Radhika PC 
							
						 
					 
					
						
						
						
						
							
						
						
							76478d963b 
							
						 
					 
					
						
						
							
							partial-fix-for-376  
						
						... 
						
						
						
						Signed-off-by: Radhika PC <radhika.puthiyetath@citrix.com> 
						
						
					 
					
						2012-10-22 09:16:28 -04:00 
						 
				 
			
				
					
						
							
							
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							1055ea8f67 
							
						 
					 
					
						
						
							
							docs: Use command tag for commands to be executed by reader.  
						
						... 
						
						
						
						This was mentioned by Joe Brockmeier on the mailinglist, to make the documentation
more readable we should use the <command> tag for to be executed commands
by the reader.
This commit does that for the KVM hypervisor host installation part. 
						
						
					 
					
						2012-10-22 12:42:35 +02:00 
						 
				 
			
				
					
						
							
							
								Joe Brockmeier 
							
						 
					 
					
						
						
						
						
							
						
						
							43bd3c3a17 
							
						 
					 
					
						
						
							
							Added generic Yum docs.  
						
						
						
						
					 
					
						2012-10-21 09:30:09 -05:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							38578bf27d 
							
						 
					 
					
						
						
							
							fixing a broken build  
						
						
						
						
					 
					
						2012-10-20 22:41:14 -04:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							bd723c252b 
							
						 
					 
					
						
						
							
							missed another firewall typo  
						
						
						
						
					 
					
						2012-10-20 22:22:30 -04:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							ec6babd4ea 
							
						 
					 
					
						
						
							
							reordering kvm installation  
						
						
						
						
					 
					
						2012-10-20 22:21:21 -04:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							f1105ff1d3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-345 - adding mdns_adv as a setting that needs to be modified  
						
						
						
						
					 
					
						2012-10-20 22:16:29 -04:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							7a940fc5f7 
							
						 
					 
					
						
						
							
							CLOUDSTACK-402 - fixing firewall statement so that it actually works  
						
						
						
						
					 
					
						2012-10-20 22:05:32 -04:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							0eff53f4f3 
							
						 
					 
					
						
						
							
							updating KVM requirements  
						
						
						
						
					 
					
						2012-10-20 21:48:33 -04:00