Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							bbbfdd52ec 
							
						 
					 
					
						
						
							
							bug 10848: Minor fixes.  
						
						
						
						
					 
					
						2011-10-31 17:00:11 +05:30 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							abb37acbdd 
							
						 
					 
					
						
						
							
							bug 8962: added usage related and resource count related code, changed the API name as suggested. Incorporated relevant review comments  
						
						
						
						
					 
					
						2011-10-31 16:35:42 +05:30 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							932e3c3a65 
							
						 
					 
					
						
						
							
							bug 11311: incremental checkin  
						
						
						
						
					 
					
						2011-10-31 12:27:17 +05:30 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							07e44e3a23 
							
						 
					 
					
						
						
							
							bug 11311: change list vm call to provide less info  
						
						
						
						
					 
					
						2011-10-30 16:25:57 +05:30 
						 
				 
			
				
					
						
							
							
								root 
							
						 
					 
					
						
						
						
						
							
						
						
							a572205e3c 
							
						 
					 
					
						
						
							
							Revert "bug 11311: vm summary command initial impl"  
						
						... 
						
						
						
						This reverts commit 0abc7e2ea8b9e222f1927aea72d46240bfe8c534. 
						
						
					 
					
						2011-10-30 15:13:58 +05:30 
						 
				 
			
				
					
						
							
							
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							2b370ab535 
							
						 
					 
					
						
						
							
							bug 10657: Introducing cluster level global thresholds for cpu and ram so that these resources do not go beyond these thresholds. The reason for this is because, if the admn needs to provide maintenance, they don't have to add new machines or have ones on standby if the entire zone/pod/cluster is at 100% allocated capacity. Also introducing pool level global thresholds for allocated storage. There are other changes like DB upgrade and introduction of transaction.  
						
						
						
						
					 
					
						2011-10-29 16:51:37 +05:30 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							3e5f63f08b 
							
						 
					 
					
						
						
							
							Bug 11863 - OVM - attempt to add host which is already added to same or different cluster does not generate UI error  
						
						... 
						
						
						
						status 11863: resolved fixed 
						
						
					 
					
						2011-10-28 17:41:15 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							4a3deefd02 
							
						 
					 
					
						
						
							
							Swift : template sync fix  
						
						
						
						
					 
					
						2011-10-28 16:49:24 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							2b039530c0 
							
						 
					 
					
						
						
							
							Swift : list Template  
						
						
						
						
					 
					
						2011-10-28 16:07:31 -07:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							3f630ebe08 
							
						 
					 
					
						
						
							
							add upgrade path from 2.2.x to 2.2.13 for baremetal  
						
						
						
						
					 
					
						2011-10-28 14:30:57 -07:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							fec9cc86af 
							
						 
					 
					
						
						
							
							allow multiple clusters for baremetal  
						
						
						
						
					 
					
						2011-10-28 13:47:21 -07:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							1ef620121a 
							
						 
					 
					
						
						
							
							Use constant string instead of hard coding in baremetal parameters passing  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/baremetal/BareMetalDiscoverer.java 
						
						
					 
					
						2011-10-28 11:07:28 -07:00 
						 
				 
			
				
					
						
							
							
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							0d1f89f507 
							
						 
					 
					
						
						
							
							bug 10530: Add vmid in the logs  
						
						
						
						
					 
					
						2011-10-28 23:36:07 +05:30 
						 
				 
			
				
					
						
							
							
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							5ffbf711fe 
							
						 
					 
					
						
						
							
							bug 11739: Fix typo  
						
						
						
						
					 
					
						2011-10-28 23:33:52 +05:30 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							7b982efeaa 
							
						 
					 
					
						
						
							
							Fixed Advance zone creation with security group enabled  
						
						
						
						
					 
					
						2011-10-28 10:24:37 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							6445bf4c49 
							
						 
					 
					
						
						
							
							Added services/capabilities to the SecurityGroupElement  
						
						
						
						
					 
					
						2011-10-28 09:52:40 -07:00 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							f456462443 
							
						 
					 
					
						
						
							
							bug 11311: vm summary command initial impl  
						
						
						
						
					 
					
						2011-10-28 14:07:19 +05:30 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							3cb1426a6c 
							
						 
					 
					
						
						
							
							bug 10588: sending cluster sync only for xen  
						
						
						
						
					 
					
						2011-10-28 11:39:22 +05:30 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							d1084bb383 
							
						 
					 
					
						
						
							
							fix unable to find built-in template  
						
						
						
						
					 
					
						2011-10-27 19:19:19 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							b413a625f4 
							
						 
					 
					
						
						
							
							1) replaced joinProject API with updateProjectInvitation api. You can accept/decline the invitataion with this command  
						
						... 
						
						
						
						2) Added deleteProjectInviation command. Can be executed by project admin only 
						
						
					 
					
						2011-10-27 18:32:00 -07:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							eb0fdc2925 
							
						 
					 
					
						
						
							
							allow multiple clusters for baremetal planner  
						
						... 
						
						
						
						fix build 
						
						
					 
					
						2011-10-27 17:46:54 -07:00 
						 
				 
			
				
					
						
							
							
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							1583211352 
							
						 
					 
					
						
						
							
							Fixing build after removing physicalNetworkId  from createvlanIpRangeCmd  
						
						
						
						
					 
					
						2011-10-27 17:42:42 -07:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							c81477a25c 
							
						 
					 
					
						
						
							
							allow multiple clusters for baremetal planner  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/deploy/BareMetalPlanner.java 
						
						
					 
					
						2011-10-27 17:39:14 -07:00 
						 
				 
			
				
					
						
							
							
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							6d5601a84d 
							
						 
					 
					
						
						
							
							Added commands and framework for PhysicalNetwork trafficTypes  
						
						
						
						
					 
					
						2011-10-27 17:32:15 -07:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							171e11a89b 
							
						 
					 
					
						
						
							
							fix deploydb due to new agent manager merge  
						
						
						
						
					 
					
						2011-10-27 17:18:18 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							d315e57b0e 
							
						 
					 
					
						
						
							
							Renamed "type" to "guestType"  
						
						
						
						
					 
					
						2011-10-27 16:51:42 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							fe0b685e95 
							
						 
					 
					
						
						
							
							Security group is a service now  
						
						
						
						
					 
					
						2011-10-27 16:49:20 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							71b53a3432 
							
						 
					 
					
						
						
							
							Made isSharedSourceNatService a capability of SoureNatService  
						
						
						
						
					 
					
						2011-10-27 16:49:20 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							02ada73d89 
							
						 
					 
					
						
						
							
							NaaS: Make applyIp() as a function of FirewallServiceProvider  
						
						
						
						
					 
					
						2011-10-27 16:45:40 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							bf4e21f315 
							
						 
					 
					
						
						
							
							NaaS: Destroy virtual router when cleanup=true at shutdown  
						
						... 
						
						
						
						As we did in the restart() function. 
						
						
					 
					
						2011-10-27 16:45:34 -07:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							9e88c40ab0 
							
						 
					 
					
						
						
							
							clean out various interface from agent manager to decent managers  
						
						
						
						
					 
					
						2011-10-27 16:06:51 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							4116d0d4e4 
							
						 
					 
					
						
						
							
							Swift :  bug fix  
						
						
						
						
					 
					
						2011-10-27 16:04:18 -07:00 
						 
				 
			
				
					
						
							
							
								keshav 
							
						 
					 
					
						
						
						
						
							
						
						
							05560d2222 
							
						 
					 
					
						
						
							
							When deleting proxy ARP entries, first check that no static/source/destination NAT rules use them  
						
						
						
						
					 
					
						2011-10-27 14:59:22 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							e1e96c0bb3 
							
						 
					 
					
						
						
							
							NaaS: Add ServiceProviders  
						
						... 
						
						
						
						Added PortForwardingServiceProvider, StaticNatServiceProvider, rename
PasswordServiceProvider to UserDataServiceProvider(may rename to a better name
later).
Add related function for service providers. 
						
						
					 
					
						2011-10-27 11:55:10 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							b369e45c78 
							
						 
					 
					
						
						
							
							NaaS: Remove some configure items for virtual router  
						
						... 
						
						
						
						DHCP range, domain name, etc. are the property of network, not virtual router
specific.
The focus of virtual router configuration would on separate enable/disable each
service it provided. 
						
						
					 
					
						2011-10-27 11:55:03 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							d1141aff7d 
							
						 
					 
					
						
						
							
							Swift : add Swift api  
						
						
						
						
					 
					
						2011-10-27 11:48:48 -07:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							21de281276 
							
						 
					 
					
						
						
							
							Fix broken compilation by new anget manager merge  
						
						
						
						
					 
					
						2011-10-27 11:24:10 -07:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							cef30956e9 
							
						 
					 
					
						
						
							
							Merge branch 'newagentmgr'  
						
						... 
						
						
						
						Conflicts:
	agent-simulator/src/com/cloud/api/commands/ConfigureSimulator.java
	ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/capacity/CapacityManagerImpl.java
	server/src/com/cloud/network/F5BigIpManagerImpl.java
	server/src/com/cloud/network/JuniperSrxManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/db/GenericDao.java 
						
						
					 
					
						2011-10-27 11:09:56 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							cb329095b1 
							
						 
					 
					
						
						
							
							When restartNetwork, just shutdown/implement elements and rules, no need to shutdown/implement the network itself.  
						
						
						
						
					 
					
						2011-10-27 10:47:41 -07:00 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							a1a0fdc0a3 
							
						 
					 
					
						
						
							
							bug 10588: making sure the vms are synced during a delta also  
						
						
						
						
					 
					
						2011-10-27 15:56:53 +05:30 
						 
				 
			
				
					
						
							
							
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							8ee876a9a2 
							
						 
					 
					
						
						
							
							bug 10405: Added annontation since for API Commands and request parameters. Whenever a new APi or parameter is added since=version should be added  
						
						... 
						
						
						
						status 10405: resolved fixed 
						
						
					 
					
						2011-10-27 14:18:34 +05:30 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							57ac50799b 
							
						 
					 
					
						
						
							
							fixed a typo  
						
						
						
						
					 
					
						2011-10-27 13:45:22 +05:30 
						 
				 
			
				
					
						
							
							
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							d55c827f00 
							
						 
					 
					
						
						
							
							bug 4844: Added length in API parameter annotation. Throw invalid param exception when value of param is greater than length. Default length is 255.  
						
						... 
						
						
						
						status 4844: resolved fixed 
						
						
					 
					
						2011-10-27 12:46:01 +05:30 
						 
				 
			
				
					
						
							
							
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							f798d9950e 
							
						 
					 
					
						
						
							
							bug 10848: DB upgrade changes for dashboard work  
						
						
						
						
					 
					
						2011-10-27 11:56:23 +05:30 
						 
				 
			
				
					
						
							
							
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							9027263c42 
							
						 
					 
					
						
						
							
							bug 10848: DB upgrade changes for dashboard work  
						
						
						
						
					 
					
						2011-10-27 11:24:18 +05:30 
						 
				 
			
				
					
						
							
							
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							f85d558b6e 
							
						 
					 
					
						
						
							
							bug 10774: Introduce percentage in list commands and cluster id in alert table  
						
						
						
						
					 
					
						2011-10-27 11:23:57 +05:30 
						 
				 
			
				
					
						
							
							
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							b336a8b813 
							
						 
					 
					
						
						
							
							bug 10774: On removing storage, local storage, cluster handle deletion of corresponding op_host_capacity rows.  
						
						
						
						
					 
					
						2011-10-27 11:23:43 +05:30 
						 
				 
			
				
					
						
							
							
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							70aae9666b 
							
						 
					 
					
						
						
							
							bug 10774: On removing storage, local storage, cluster handle deletion of corresponding op_host_capacity rows.  
						
						
						
						
					 
					
						2011-10-27 11:23:26 +05:30 
						 
				 
			
				
					
						
							
							
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							9ba4b7073e 
							
						 
					 
					
						
						
							
							bug 10893: Adding config vlaue conventions.  
						
						
						
						
					 
					
						2011-10-27 11:22:53 +05:30 
						 
				 
			
				
					
						
							
							
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							30793ff08b 
							
						 
					 
					
						
						
							
							bug 10893: Adding config vlaue conventions.  
						
						
						
						
					 
					
						2011-10-27 11:22:36 +05:30