Hugo Trippaers
							
						 
					 | 
					
						
						
						
						
							
						
						
							11dc1f0b8e
							
						
					 | 
					
						
						
							
							Check manageontap sdk version and provide instructions.
						
						
						
						
						
						
					 | 
					
						2012-10-15 17:25:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hugo Trippaers
							
						 
					 | 
					
						
						
						
						
							
						
						
							aa6355ffe6
							
						
					 | 
					
						
						
							
							Updated master to 4.1.0
						
						
						
						
						
						
						
						mvn release:update-versions -DautoVersionSubmodules=true -Dnonoss -P
client,deps,developer  -DdevelopmentVersion=4.1.0-SNAPSHOT 
						
						
					 | 
					
						2012-10-01 11:00:55 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jie Feng
							
						 
					 | 
					
						
						
						
						
							
						
						
							c9aa08350a
							
						
					 | 
					
						
						
							
							[DOC] docbook conversion - choosing a deployment architecture
						
						
						
						
						
						
					 | 
					
						2012-09-13 16:12:06 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								olivier lamy
							
						 
					 | 
					
						
						
						
						
							
						
						
							fe8a01106b
							
						
					 | 
					
						
						
							
							rename cloud-plugins to cloudstack-plugins
						
						
						
						
						
						
					 | 
					
						2012-08-27 16:53:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								olivier lamy
							
						 
					 | 
					
						
						
						
						
							
						
						
							a06ed5728c
							
						
					 | 
					
						
						
							
							remove intermediate parent poms
						
						
						
						
						
						
					 | 
					
						2012-08-27 16:43:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								olivier lamy
							
						 
					 | 
					
						
						
						
						
							
						
						
							3aa469da2a
							
						
					 | 
					
						
						
							
							groupdId is now org.apache.cloudstack
						
						
						
						
						
						
					 | 
					
						2012-08-25 09:20:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								olivier lamy
							
						 
					 | 
					
						
						
						
						
							
						
						
							5ef60aceb1
							
						
					 | 
					
						
						
							
							%s/tab/ws/
						
						
						
						
						
						
					 | 
					
						2012-08-25 00:03:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Darren Shepherd
							
						 
					 | 
					
						
						
						
						
							
						
						
							4a4007e652
							
						
					 | 
					
						
						
							
							Add license
						
						
						
						
						
						
					 | 
					
						2012-08-24 11:18:54 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Darren Shepherd
							
						 
					 | 
					
						
						
						
						
							
						
						
							ebc0fa458a
							
						
					 | 
					
						
						
							
							* Maven 3 support
						
						
						
						
						
						
						
						* Pretty Format POM's
* AWS API compiles now 
						
						
					 | 
					
						2012-08-24 11:18:54 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Darren Shepherd
							
						 
					 | 
					
						
						
						
						
							
						
						
							f826971fea
							
						
					 | 
					
						
						
							
							Maven config, initial commit
						
						
						
						
						
						
					 | 
					
						2012-08-24 11:18:52 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chip Childers
							
						 
					 | 
					
						
						
						
						
							
						
						
							3a882fa17c
							
						
					 | 
					
						
						
							
							License header updates for the plugins folder.
						
						
						
						
						
						
					 | 
					
						2012-08-03 09:07:43 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alena Prokharchyk
							
						 
					 | 
					
						
						
						
						
							
						
						
							7acf8585b1
							
						
					 | 
					
						
						
							
							Resource tags: 1) Remove tag records when correspdonding cloudStack object gets removed
						
						
						
						
						
						
						
						2) added "tags" request parameter to the banch of list* Api commands (listVirtualMachines, listSnapshots - all commands are listed in the resource tags functional spec)
Conflicts:
	api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
	api/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java
	api/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java
	api/src/com/cloud/api/commands/ListSecurityGroupsCmd.java
	api/src/com/cloud/api/commands/ListSnapshotsCmd.java
	api/src/com/cloud/api/commands/ListVolumesCmd.java
	api/src/com/cloud/api/response/FirewallResponse.java
	api/src/com/cloud/api/response/IPAddressResponse.java
	api/src/com/cloud/api/response/VolumeResponse.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
	server/src/com/cloud/vm/dao/UserVmDaoImpl.java 
						
						
					 | 
					
						2012-07-06 11:43:31 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Murali reddy
							
						 
					 | 
					
						
						
						
						
							
						
						
							8aa2b55dd6
							
						
					 | 
					
						
						
							
							moving out NetApp code to plugins/file-systems/netapp
						
						
						
						
						
						
					 | 
					
						2012-07-02 08:34:02 -07:00 | 
					
					
						
						
							
							
							
						
					 |