cloudstack/server/src/com/cloud
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
..
account Added more changes to the api 2010-10-21 15:11:49 -07:00
acl 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. 2011-08-24 14:48:35 -07:00
agent Bug 9921 - template tags 2011-08-25 12:03:59 -07:00
alert Merge branch '2.2.y' 2011-08-22 20:28:30 -07:00
api Bug 9921 - template tags 2011-08-25 12:03:59 -07:00
async 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. 2011-08-24 14:48:35 -07:00
baremetal Method signature change 2011-08-24 14:56:37 -07:00
capacity fix build, add test rpm back 2011-08-24 13:24:51 -07:00
certificate/dao Add license header to files 2011-04-14 11:23:14 -07:00
cluster Merge branch '2.2.y' 2011-08-22 20:28:30 -07:00
configuration bug 10617: This is Intermediate commit for Egress rules implementation in security groups. 2011-08-25 12:18:33 +05:30
consoleproxy Merge branch 'cvm' into 2.2.y 2011-08-19 16:08:35 -07:00
dao Port forwarding rules and load balancing rules rewrite 2010-12-03 08:48:02 -08:00
dc Merge branch 'cvm' into 2.2.y 2011-08-19 16:08:35 -07:00
deploy bug 11219: use local storage flag from service offering when it is ROOT disk 2011-08-24 15:17:53 -07:00
domain Use row lock instead of global lock when creating a new domain 2011-08-18 10:42:12 -07:00
event throw exception after intercepting to log error event 2011-07-19 18:39:32 +05:30
ha Full opensource 2011-08-23 19:52:19 -07:00
host/dao bug 11242: check if db object is already removed before generating the Debug log. It can happen in case when deleteHost command is called many times in parallel for the same host 2011-08-24 15:48:18 -07:00
hypervisor Full opensource 2011-08-23 19:52:19 -07:00
keystore Finalize custom certficate support. hook with UI 2011-04-22 13:45:09 -07:00
maint Use Long type for version comparsion 2011-03-22 11:07:11 -07:00
migration bug 10305: for a systemvm only applicable system vm offering should be displayed 2011-06-20 20:11:50 +05:30
netapp Full opensource 2011-08-23 19:52:19 -07:00
network bug 11185: support multiple CIDR on overlapping port ranges for firewall rules 2011-08-25 12:21:11 -07:00
offerings Defined missing length field for VO classes 2011-08-17 15:13:28 -07:00
projects Method signature change 2011-08-24 14:56:37 -07:00
resource Remove baremetal specific parameters from AddHostCmd 2011-08-19 17:12:23 -07:00
secstorage Move VMware/Premium Secondary storage VM to opensource 2011-08-23 14:43:39 -07:00
server 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. 2011-08-24 14:48:35 -07:00
service bug 10681: for serviceOfferings, diskOfferings, templates/isos return records with not null Removed field on findById method call 2011-07-13 18:25:13 -07:00
servlet Bug 10860 - PremiumUpgrade is not run when upgrading to 2.2.8 (edit) 2011-07-29 20:23:30 -07:00
storage 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. 2011-08-24 14:48:35 -07:00
template Bug 9921 - template tags 2011-08-25 12:16:09 -07:00
test bug 10305: for a systemvm only applicable system vm offering should be displayed 2011-06-20 20:11:50 +05:30
upgrade Bug 9921 - template tags 2011-08-25 12:09:21 -07:00
usage Full opensource 2011-08-23 19:52:19 -07:00
user 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. 2011-08-24 14:48:35 -07:00
vm Bug 9921 - template tags 2011-08-25 12:03:59 -07:00