Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							599631b9e8 
							
						 
					 
					
						
						
							
							bug 10588: adding new classes  
						
						 
						
						
						
						
					 
					
						2011-09-21 17:20:51 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							f49578c23a 
							
						 
					 
					
						
						
							
							bug 11051: ListZones - Introduce a flag 'showCapacitites'. When its true it will start displaying all the capacitites (as objects in the response) for the respective zone. Also correcting the summation logic for List cluster, pod and zone commands  
						
						 
						
						
						
						
					 
					
						2011-09-21 16:59:16 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							a1331d1cfc 
							
						 
					 
					
						
						
							
							Intermidiate checkin to Project feature:  
						
						 
						
						... 
						
						
						
						1) Introduce new managers - ProjectManager and DomainManager. Moved all domain related code from AccountManager to DomainManager.
2) Moved some code from ManagementServerImpl to the correct managers.
3) New resource limit for Domain - Project 
						
						
					 
					
						2011-09-20 18:35:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							b6f58b77b8 
							
						 
					 
					
						
						
							
							bug 11462: 1) when delete PF rule, revoke corresponding firewall first (if exists) 2) never remove PF rule from the table when corresponding firewall rule wasn't removed yet  
						
						 
						
						... 
						
						
						
						status 11462: resolved fixed
Reviewed-by: edison@cloud.com 
Conflicts:
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java 
						
						
					 
					
						2011-09-20 10:32:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							7bcbdeb834 
							
						 
					 
					
						
						
							
							bug 11051: ListPods - Introduce a flag 'showCapacitites'. When its true it will start displaying all the capacitites (as objects in the response) for the respective cluster.  
						
						 
						
						
						
						
					 
					
						2011-09-20 15:59:45 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							4a5f6faca2 
							
						 
					 
					
						
						
							
							bug 11051: ListClusters - Introduce a flag 'showCapacitites'. When its true it will start displaying all the capacitites (as objects in the response) for the respective cluster.  
						
						 
						
						
						
						
					 
					
						2011-09-20 14:33:46 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							ba64010cb5 
							
						 
					 
					
						
						
							
							bug 11470: 1) fixed listResourceLimits 2) Fixed -1 to be treated as unlimited for all the resources  
						
						 
						
						... 
						
						
						
						status 11470: resolved fixed 
						
						
					 
					
						2011-09-19 09:47:07 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							d53c3f0798 
							
						 
					 
					
						
						
							
							bug 11051: Listing Secondary Storage - also show the total and used storage. Listing Storage pools show the realtime storage stats and correctly populate the allocated storage.  
						
						 
						
						
						
						
					 
					
						2011-09-15 15:53:31 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							10fb507609 
							
						 
					 
					
						
						
							
							bug 11372:  
						
						 
						
						... 
						
						
						
						Added two New values "all" and "default" to global config "network.loadbalancer.haproxy.stats.visibility" . With this change, it can take six possible value:
            global - stats visible from public network.
            guest-network - stats visible only to guestnetwork.
            link-local - stats visible only to link local network(for xen and kvm).
            disabled - stats disabled.
            all - stats available on public,guest and link-local. (Newly added)
            default - stats availble on the serving http port, this does need any specific http port.(Newly added)
   Except "default" and "disabled", all the rest of 4 need to configure the stats port. 
						
						
					 
					
						2011-09-15 11:46:34 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							6ecc981e25 
							
						 
					 
					
						
						
							
							bug 9777: introduce Error status for snapshot, if snapshot creation fails, it will be in Error status  
						
						 
						
						... 
						
						
						
						status 9777: resolved fixed 
						
						
					 
					
						2011-09-14 18:14:02 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							9317033a4f 
							
						 
					 
					
						
						
							
							Add missing files for redundant router.  
						
						 
						
						
						
						
					 
					
						2011-09-14 16:25:56 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							474d1a6034 
							
						 
					 
					
						
						
							
							bug 11307: Add destroyRouter command  
						
						 
						
						
						
						
					 
					
						2011-09-14 16:23:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							684a603a6e 
							
						 
					 
					
						
						
							
							bug 11307: Add cleanup parameter to restartNetwork command  
						
						 
						
						... 
						
						
						
						Default set it to true. When cleanup=false, restartNetwork would only
re-implement the network, but don't destroy current existed routers. 
						
						
					 
					
						2011-09-14 16:23:34 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							e330e97f4b 
							
						 
					 
					
						
						
							
							bug 11307: Mark router as to-be-stopped, rather than force stop it.  
						
						 
						
						... 
						
						
						
						Force stop the router would release all the resources it used, but router may
still running. Add a column "stop_pending" in the database, and stop it when the
router come back.
Admin would able to choose to force destroy such router, then recover the
network using restartNetwork command with cleanup=false. 
						
						
					 
					
						2011-09-14 16:23:17 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							7744fee649 
							
						 
					 
					
						
						
							
							bug 11307: Enable CheckRouterAnswer to tell if redundant router's priority is bumped or not  
						
						 
						
						
						
						
					 
					
						2011-09-14 16:22:02 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							b987123daa 
							
						 
					 
					
						
						
							
							bug 11307: Let CheckRouterAnswer() parse the return result  
						
						 
						
						
						
						
					 
					
						2011-09-14 16:21:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							7a64d8fda4 
							
						 
					 
					
						
						
							
							add VmwareInvestigator and VmwareFencer, use short worker VM name to avoid vCenter truncation  
						
						 
						
						
						
						
					 
					
						2011-09-14 15:15:26 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							f18dd42908 
							
						 
					 
					
						
						
							
							bug 11239: add check for hypervisor type when deploy vm, no way to deploy a vm with hypervisor type None  
						
						 
						
						
						
						
					 
					
						2011-09-13 18:53:14 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							1d2a084bbe 
							
						 
					 
					
						
						
							
							add jna dependenc  
						
						 
						
						
						
						
					 
					
						2011-09-13 18:52:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							b05c69f3b3 
							
						 
					 
					
						
						
							
							bug 11246: return lb rule Id in the async response for createLoadBalancer api  
						
						 
						
						... 
						
						
						
						status 11246: resolved fixed 
						
						
					 
					
						2011-09-13 12:08:12 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							d1cfe58c0f 
							
						 
					 
					
						
						
							
							bug 11412: use "sshkeypair" instead of "keypair" in response name for ssh commands  
						
						 
						
						... 
						
						
						
						status 11412: resolved fixed 
						
						
					 
					
						2011-09-13 11:00:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							f6a79c603f 
							
						 
					 
					
						
						
							
							bug 11036: resource count update is refactored  
						
						 
						
						... 
						
						
						
						status 11036: resolved fixed
1) Use row locks instead of global lock when update resource_count table. When update resource_count for account, make sure that we lock account+all related domains
2) Insert resource_count records for account/domain at the moment when account/domain is created.
3) As a part of DB upgrade, insert missing resource_count records for all non-removed accounts/domains
Conflicts:
	core/src/com/cloud/alert/AlertManager.java
	server/test/com/cloud/agent/MockAgentManagerImpl.java 
						
						
					 
					
						2011-09-13 10:47:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							3cb4ad4934 
							
						 
					 
					
						
						
							
							Add more detail when unable to schedule cleanup  
						
						 
						
						... 
						
						
						
						clean up tests for security group manager v2
move interval to listener -- allows it to be configurable if needed
fix mocks
Enhanced logging for security group manager (from zucchini)
fix merge issues
merge issues 
						
						
					 
					
						2011-09-12 18:22:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							fae5e84699 
							
						 
					 
					
						
						
							
							if the xenserver host cannot do bridge firewalling do not attempt to retry the security rule updat  
						
						 
						
						... 
						
						
						
						change some logs to debug level 
						
						
					 
					
						2011-09-12 18:20:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							65fb83035f 
							
						 
					 
					
						
						
							
							Enable monitoring over JMX  
						
						 
						
						... 
						
						
						
						Add the ability to disable some vms from being scheduled
Add ability to trigger ruleset updates from JMX
added a few more dangerous JMX operations 
						
						
					 
					
						2011-09-12 18:20:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							82fcfe8edc 
							
						 
					 
					
						
						
							
							make signature calculation consistent across management servers  
						
						 
						
						
						
						
					 
					
						2011-09-12 18:20:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							d03c5af720 
							
						 
					 
					
						
						
							
							make instance_id unique to allow usage of ON DUPLICATE KEY  
						
						 
						
						... 
						
						
						
						useful logging
Reduce batch size to 16 to avoid sql errors
try using multi inserts to overcome deadlock during batch update 
						
						
					 
					
						2011-09-12 18:20:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							e216686029 
							
						 
					 
					
						
						
							
							Revert "bug 10617: Intermediate checking"  
						
						 
						
						... 
						
						
						
						revert pending review
This reverts commit 561b27565512d438db3d8896df6f97b644b0b498. 
						
						
					 
					
						2011-09-12 14:45:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							f9b0962ad9 
							
						 
					 
					
						
						
							
							bug 10617: Intermediate checking  
						
						 
						
						... 
						
						
						
						Changes :
         - Fixing API doc +response name + errorMessage
         - Adding seperate events to Egress rules
         - Egress rules Using the same database table as that of ingress with new column type.
   Pending Tasks:
         - db upgrade
         - database table rename from security_ingress_rule to generic name, renaming some of the jave class from ingress to generic name.
         - Retesting on kvm 
						
						
					 
					
						2011-09-09 18:14:19 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							4ad9ac5e71 
							
						 
					 
					
						
						
							
							Bug 11200 - maximum number of guests per host  
						
						 
						
						... 
						
						
						
						Changes:
To make sure migration does not attempt to pick a host that has running VMs more than the max guest VM's limit:
- Changed manual migration to call host allocators to return a list of hosts suitable for migration. Host allocators check for the max guest VM limit.
- Earlier we returned hosts with enough capacity but now Host Allocators make other checks along with capacity. So the list of hosts returned are hosts that have enough capacity AND satisfy all other conditions like host tags, max guests limit etc. Or in other words Allocators dont return the hosts that dont satisfy all conditions even if they have capacity.
-Therefore, now we mark the list of hosts returned for manual migration as 'suitable' hosts instead of 'hasenoughCapacity' in the HostResponse.
- HA migration already calls allocators, so no change is needed there. 
						
						
					 
					
						2011-09-08 18:08:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							4423da06a2 
							
						 
					 
					
						
						
							
							1. added timeout in Command Class,  then each command can configure itself timeout, if timeout is not configed, use the default timeout , which is 30 minute  
						
						 
						
						... 
						
						
						
						2. added following configurable timeout
       PrimaryStorageDownloadWait("Storage", TemplateManager.class, Integer.class, "primary.storage.download.wait", "10800", "In second, timeout for download template to primary storage", null),
       CreateVolumeFromSnapshotWait("Storage", StorageManager.class, Integer.class, "create.volume.from.snapshot.wait", "10800", "In second, timeout for create template from snapshot", null),
       CopyVolumeWait("Storage", StorageManager.class, Integer.class, "copy.volume.wait", "10800", "In second, timeout for copy volume command", null),
       CreatePrivateTemplateFromVolumeWait("Storage", UserVmManager.class, Integer.class, "create.private.template.from.volume.wait", "10800", "In second, timeout for CreatePrivateTemplateFromVolumeCommand", null),
       CreatePrivateTemplateFromSnapshotWait("Storage", UserVmManager.class, Integer.class, "create.private.template.from.snapshot.wait", "10800", "In second, timeout for CreatePrivateTemplateFromSnapshotCommand", null),
       BackupSnapshotWait("Storage", StorageManager.class, Integer.class, "backup.snapshot.wait", "10800", "In second, timeout for BackupSnapshotCommand", null), 
						
						
					 
					
						2011-09-07 19:17:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							905df61aac 
							
						 
					 
					
						
						
							
							bug 11362: Make VM network adapter device type be selectable based on VM-specific details  
						
						 
						
						
						
						
					 
					
						2011-09-07 17:58:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							84868b7f9c 
							
						 
					 
					
						
						
							
							Bug 11200 - maximum number of guests per host  
						
						 
						
						... 
						
						
						
						Changes:
- Adding a new table 'hypervisor_capabilities' that will record capabilities for each hypervisor version. Added db schema changes for this.
- Currently a few capabilities have been added, namely, 'max_guests_limit' and 'security_group_enabled'
- Added a new column 'hypervisor_version' to host table. StartupRouting command now takes in this parameter. It should be set when a host connects.
- If a host's hypervisor version is not present, we find all the capabilities rows for that hypervisor type and use the first record.
- 'max_guests_limit' is the maximum number of running guest Vms that a host can have for the given hypervisor.
- Host Allocators use this limit and skip a host if the number of running VMs on that host exceeds this limit. 
						
						
					 
					
						2011-09-07 14:53:05 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							f9d5a46871 
							
						 
					 
					
						
						
							
							Compare current and previous network stats before updating. Ignore stats if the current stats are not same as the prev stats. Set NetworkUsageAnswer log level to debug  
						
						 
						
						
						
						
					 
					
						2011-09-05 18:41:42 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							b35e85c571 
							
						 
					 
					
						
						
							
							bug 10712: Display name instead of id  
						
						 
						
						
						
						
					 
					
						2011-09-05 15:55:07 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							4d3d47f01c 
							
						 
					 
					
						
						
							
							bug 11304: restore host status after initialization failure  
						
						 
						
						
						
						
					 
					
						2011-09-02 15:19:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							8b5f2c758e 
							
						 
					 
					
						
						
							
							Do account permission checks for snapshots the way it's done for all other ControlledEntities  
						
						 
						
						
						
						
					 
					
						2011-08-31 18:15:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							9abb544865 
							
						 
					 
					
						
						
							
							bug 6876: netscaler MPX & VPX support  
						
						 
						
						... 
						
						
						
						- adding supprt for Netscaler VPX & MPX load blancers
    - implemented for virtual networking
    - works only with new fetched public IP, inline support is not added yet 
						
						
					 
					
						2011-08-30 00:14:05 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							35b551a199 
							
						 
					 
					
						
						
							
							bug 11260: Take networkRate for domR's guest and public interface from the corresponding system service offering  
						
						 
						
						
						
						
					 
					
						2011-08-25 14:15:12 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							1fefdd628d 
							
						 
					 
					
						
						
							
							Bug 11261 - Allow to update host tags  
						
						 
						
						... 
						
						
						
						Changes:
- Changes to updateHostCmd to accepts hosttags parameter
- Changes to wipe out existing tags and save new ones in host_tags DB.
- UpdateHost is Admin only operation - so only root admin can update host tags 
						
						
					 
					
						2011-08-25 13:01:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							8c53dbcdd7 
							
						 
					 
					
						
						
							
							bug 11185: support multiple CIDR on overlapping port ranges for firewall rules  
						
						 
						
						... 
						
						
						
						status 11185: resolved fixed
Conflicts:
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
Conflicts:
	api/src/com/cloud/network/firewall/FirewallService.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java 
						
						
					 
					
						2011-08-25 12:21:11 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							05440f0905 
							
						 
					 
					
						
						
							
							Bug 9921 - template tags  
						
						 
						
						... 
						
						
						
						Changes:
- CreateTemplate and RegisterTemplate now support adding a template tag. It is a string value. This is root-admin only action - only admin can add template tags.
- ListTemplates will return the template tag in response.
- HostAllocator changed to use template tag along with the existing tag on service offering. If both tags are present, allocator now finds hosts satisfying both tags. If no hosts have both tags, allocation will fail.
- DB changes to add new column to vm_template table.
- DB upgrade changes for upgrade from 2.2.10 to 2.2.11 
						
						
					 
					
						2011-08-25 12:03:59 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							9391938908 
							
						 
					 
					
						
						
							
							fix conflict  
						
						 
						
						
						
						
					 
					
						2011-08-24 18:47:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							e3f179844e 
							
						 
					 
					
						
						
							
							bug 11236: domainAdmin/regularUser can edit/delete/copy/extract Public template/iso only if it was created by them. They still can use/see public template/iso when execute list/deploy/attachIso commands.  Root admin can operate with other people templates w/o any restrictions.  
						
						 
						
						... 
						
						
						
						status 11236: resolved fixed 
						
						
					 
					
						2011-08-24 14:48:35 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							d3eb9db7fa 
							
						 
					 
					
						
						
							
							bug 11204: when search for domR/dhcp, include Role to the corresponding search to eliminate getting "LB" network element in the response  
						
						 
						
						... 
						
						
						
						status 11204: resolved fixed
Conflicts:
	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java 
						
						
					 
					
						2011-08-23 12:05:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							8a7feb8ec1 
							
						 
					 
					
						
						
							
							Merge branch '2.2.y'  
						
						 
						
						... 
						
						
						
						Conflicts:
	agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
	api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
	api/src/com/cloud/agent/api/to/FirewallRuleTO.java
	api/src/com/cloud/agent/api/to/IpAddressTO.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	api/src/com/cloud/api/commands/CreateFirewallRuleCmd.java
	api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java
	api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
	api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java
	api/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java
	api/src/com/cloud/api/commands/ListCapabilitiesCmd.java
	api/src/com/cloud/api/commands/UpdateNetworkCmd.java
	api/src/com/cloud/api/response/CapabilitiesResponse.java
	api/src/com/cloud/network/Network.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/firewall/FirewallService.java
	api/src/com/cloud/network/lb/LoadBalancingRule.java
	api/src/com/cloud/network/lb/LoadBalancingRulesService.java
	api/src/com/cloud/network/rules/FirewallRule.java
	api/src/com/cloud/network/rules/RulesService.java
	api/src/com/cloud/offering/NetworkOffering.java
	client/tomcatconf/commands.properties.in
	cloud.spec
	core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
	core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
	core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	core/src/com/cloud/vm/DomainRouterVO.java
	debian/cloud-deps.install
	patches/systemvm/debian/config/etc/init.d/cloud-early-config
	patches/systemvm/debian/config/root/ipassoc.sh
	patches/systemvm/debian/config/root/loadbalancer.sh
	scripts/vm/hypervisor/kvm/rundomrpre.sh
	scripts/vm/hypervisor/xenserver/vmops
	server/src/com/cloud/agent/manager/AgentAttache.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/agent/manager/AgentMonitor.java
	server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
	server/src/com/cloud/alert/ClusterAlertAdapter.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/cluster/ClusterManagerImpl.java
	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/configuration/ConfigurationManager.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
	server/src/com/cloud/network/LoadBalancerVO.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDao.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/element/DhcpElement.java
	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/FirewallManager.java
	server/src/com/cloud/network/rules/FirewallRuleVO.java
	server/src/com/cloud/network/rules/PortForwardingRuleVO.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/rules/StaticNatRuleImpl.java
	server/src/com/cloud/network/security/SecurityGroupListener.java
	server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/server/ConfigurationServerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/StorageManager.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
	server/src/com/cloud/upgrade/dao/Upgrade228to229.java
	server/src/com/cloud/upgrade/dao/Upgrade229to2210.java
	server/src/com/cloud/user/AccountManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	server/src/com/cloud/vm/dao/DomainRouterDao.java
	server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
	setup/db/create-index-fk.sql
	setup/db/create-schema.sql
	setup/db/db/schema-222to224.sql
	setup/db/db/schema-227to228.sql
	setup/db/db/schema-228to229.sql
	setup/db/db/schema-229to2210.sql
	tools/testClient/README
	ui/scripts/cloud.core.instance.js
	utils/src/com/cloud/utils/SerialVersionUID.java
	utils/src/com/cloud/utils/db/ConnectionConcierge.java
	utils/src/com/cloud/utils/db/Merovingian2.java
	utils/src/com/cloud/utils/db/Transaction.java
	utils/src/com/cloud/utils/nio/Link.java
	utils/src/com/cloud/utils/nio/NioConnection.java
	utils/src/com/cloud/utils/time/InaccurateClock.java 
						
						
					 
					
						2011-08-22 20:28:30 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							c2732850f4 
							
						 
					 
					
						
						
							
							bug 11202: added "networkRate" param to service offering api responses  
						
						 
						
						
						
						
					 
					
						2011-08-22 13:35:43 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							0b061529b1 
							
						 
					 
					
						
						
							
							bug 11202: added "networkRate" param to service offering api responses  
						
						 
						
						
						
						
					 
					
						2011-08-22 13:34:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							31a022c720 
							
						 
					 
					
						
						
							
							Added networkRate parameter to createServiceOffering api command  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/configuration/ConfigurationManager.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java 
						
						
					 
					
						2011-08-22 12:05:34 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							033765f93f 
							
						 
					 
					
						
						
							
							Added networkRate parameter to createServiceOffering api command  
						
						 
						
						
						
						
					 
					
						2011-08-22 12:02:08 -07:00