Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							8f70ee08e0 
							
						 
					 
					
						
						
							
							Fix the unsolved conflicts for doc build  
						
						
						
						
					 
					
						2013-02-01 17:22:51 -08:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							296c20332d 
							
						 
					 
					
						
						
							
							Merge javelin into master  
						
						
						
						
					 
					
						2013-02-01 14:40:45 -08:00 
						 
				 
			
				
					
						
							
							
								Kanzhe Jiang 
							
						 
					 
					
						
						
						
						
							
						
						
							736b236eaf 
							
						 
					 
					
						
						
							
							bigswitch controller support  
						
						... 
						
						
						
						Reviewed-by: Chiradeep Vittal <chiradeepv@gmail.com>
Signed-off-by: Murali Reddy <murali.reddy@citrix.com> 
						
						
					 
					
						2013-02-01 12:42:04 +05:30 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							1b2b369ecb 
							
						 
					 
					
						
						
							
							Merge latest master into javelin  
						
						
						
						
					 
					
						2013-01-31 11:34:49 -08:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							ae3d8aa018 
							
						 
					 
					
						
						
							
							rat: Fix apache license  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-30 17:44:41 -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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Radhika PC 
							
						 
					 
					
						
						
						
						
							
						
						
							92fd66c921 
							
						 
					 
					
						
						
							
							CLOUDSTACK-235 Docs patch for network rate  
						
						
						
						
					 
					
						2013-01-28 10:47:02 -05:00 
						 
				 
			
				
					
						
							
							
								Radhika PC 
							
						 
					 
					
						
						
						
						
							
						
						
							b56f7b26e2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-399  
						
						... 
						
						
						
						Signed-off-by: Radhika PC <radhika.puthiyetath@citrix.com> 
						
						
					 
					
						2013-01-28 10:05:36 -05:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2fb346ab62 
							
						 
					 
					
						
						
							
							Merge branch 'master' into javelin  
						
						
						
						
					 
					
						2013-01-27 05:20:49 -08:00 
						 
				 
			
				
					
						
							
							
								Radhika PC 
							
						 
					 
					
						
						
						
						
							
						
						
							25c0d84c16 
							
						 
					 
					
						
						
							
							Document procedure to choose default System Offering for System VMs  
						
						... 
						
						
						
						Signed-off-by: Radhika PC <radhika.puthiyetath@citrix.com> 
						
						
					 
					
						2013-01-24 21:32:46 -06:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							356866c72b 
							
						 
					 
					
						
						
							
							Merge branch 'master' into javelin  
						
						... 
						
						
						
						- Fixed new join dao impls as spring components
- Fixed component context xml to load api rate limit checker
- Fixed root pom.xml for duplicate plugin
- Fixed list data centers method
- Fixed following conflicts:
	api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
	api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
	plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/swift/SwiftManagerImpl.java
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-24 19:18:53 -08:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							a8fcc4f3d3 
							
						 
					 
					
						
						
							
							Summary: Add documentation for the KVM support for OpenVswitch  
						
						... 
						
						
						
						Modified the KVM installation instructions with an example on how to use
the openvswitch bridges.
Modified the Nicira NVP plugin documentation with support for KVM
Updated the Nicira NVP docs to mention that it can be configured using
the UI now. 
						
						
					 
					
						2013-01-21 12:12:59 +01:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							38eaa04b98 
							
						 
					 
					
						
						
							
							Pull changes from master into javelin  
						
						... 
						
						
						
						- Disables simulator plugin, breaks build, available via simulator profile
- Fixes spring injections
- Fix api,acl plugins, ApiServer, ApiDispatcher
- Fix other merge conflicts
Conflicts:
	docs/en-US/external-firewalls-and-load-balancers.xml
	plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	utils/test/com/cloud/utils/log/CglibThrowableRendererTest.java
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-12 06:02:54 -08:00 
						 
				 
			
				
					
						
							
							
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							2b3084bba0 
							
						 
					 
					
						
						
							
							Per my veto vote on the dev list, reverting "SRX and f5 inline mode documentation: Reviewed-By: Jessica Tomechak"  
						
						... 
						
						
						
						This reverts commit 106730ccdde30450e96d080ed6c9791682fb7300. 
						
						
					 
					
						2013-01-11 10:19:38 -05:00 
						 
				 
			
				
					
						
							
							
								Radhika PC 
							
						 
					 
					
						
						
						
						
							
						
						
							499c474ed0 
							
						 
					 
					
						
						
							
							Autoscale Documentation : Reviewed-By: Jessica Tomechak  
						
						
						
						
					 
					
						2013-01-11 17:53:09 +05:30 
						 
				 
			
				
					
						
							
							
								Radhika PC 
							
						 
					 
					
						
						
						
						
							
						
						
							106730ccdd 
							
						 
					 
					
						
						
							
							SRX and f5 inline mode documentation: Reviewed-By: Jessica Tomechak  
						
						
						
						
					 
					
						2013-01-11 15:54:00 +05:30 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							bb59c1e385 
							
						 
					 
					
						
						
							
							Revert "<message>"  
						
						... 
						
						
						
						This reverts commit 5dd14f322c7332ebb5b9aee22f84209763e891e8. 
						
						
					 
					
						2013-01-11 15:51:28 +05:30 
						 
				 
			
				
					
						
							
							
								Author Name 
							
						 
					 
					
						
						
						
						
							
						
						
							5dd14f322c 
							
						 
					 
					
						
						
							
							<message>  
						
						
						
						
					 
					
						2013-01-11 15:47:23 +05:30 
						 
				 
			
				
					
						
							
							
								Sebastien Goasguen 
							
						 
					 
					
						
						
						
						
							
						
						
							b2ca9fe7b0 
							
						 
					 
					
						
						
							
							Added Marvin building docs to dev guide  
						
						
						
						
					 
					
						2013-01-11 10:57:00 +01:00 
						 
				 
			
				
					
						
							
							
								Sebastien Goasguen 
							
						 
					 
					
						
						
						
						
							
						
						
							5f19c45e04 
							
						 
					 
					
						
						
							
							Added Marvin building docs in developer guide  
						
						
						
						
					 
					
						2013-01-11 10:55:37 +01:00 
						 
				 
			
				
					
						
							
							
								Jessica Tomechak 
							
						 
					 
					
						
						
						
						
							
						
						
							2bc3b5cc6f 
							
						 
					 
					
						
						
							
							Docs. CLOUDSTACK-959. A sub-heading was inadvertently left out of the System Service Offerings section of documentation. Adding the section "Creating a New System Service Offering".  
						
						
						
						
					 
					
						2013-01-11 01:30:13 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							d6f44a4d6a 
							
						 
					 
					
						
						
							
							merged from master  
						
						
						
						
					 
					
						2013-01-10 15:55:42 -08:00 
						 
				 
			
				
					
						
							
							
								Joe Brockmeier 
							
						 
					 
					
						
						
						
						
							
						
						
							ffcc6d781e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-683: Fixed missing image in Accessing VM Section  
						
						
						
						
					 
					
						2013-01-10 16:01:02 -06:00 
						 
				 
			
				
					
						
							
							
								Sebastien Goasguen 
							
						 
					 
					
						
						
						
						
							
						
						
							09b68ce13f 
							
						 
					 
					
						
						
							
							Improvements to AWS installation, configuration and use in installation guide  
						
						
						
						
					 
					
						2013-01-09 13:56:24 -06:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							b6c56736e5 
							
						 
					 
					
						
						
							
							merge from master  
						
						
						
						
					 
					
						2013-01-09 05:20:36 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							a0dbbad253 
							
						 
					 
					
						
						
							
							Merge branch 'master' into api_refactoring  
						
						
						
						
					 
					
						2013-01-08 18:55:05 -08:00 
						 
				 
			
				
					
						
							
							
								radhikap 
							
						 
					 
					
						
						
						
						
							
						
						
							aa9ccf7302 
							
						 
					 
					
						
						
							
							fix for CLOUDSTACK-481  
						
						... 
						
						
						
						Signed-off-by: radhikap <radhika.puthiyetath@citrix.com> 
						
						
					 
					
						2013-01-08 15:04:19 -06:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							30f2565d98 
							
						 
					 
					
						
						
							
							Merge branch 'api_refactoring' into javelin  
						
						
						
						
					 
					
						2013-01-08 12:36:04 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							85e73a640e 
							
						 
					 
					
						
						
							
							Merge branch 'master' into api_refactoring  
						
						... 
						
						
						
						Conflicts:
	client/tomcatconf/commands.properties.in
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-03 23:27:42 -08:00 
						 
				 
			
				
					
						
							
							
								Gavin Lee 
							
						 
					 
					
						
						
						
						
							
						
						
							8cf2cb1f4e 
							
						 
					 
					
						
						
							
							[DOC]Delete duplicated, mis-spelling xml files.  
						
						
						
						
					 
					
						2013-01-04 10:25:34 +08:00 
						 
				 
			
				
					
						
							
							
								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