cloudstack/api/src/com/cloud
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
..
acl Fixed security issue in api - regular user can operate only with his own resources (except for the template - when the template is public, it's available for everyone) 2011-05-24 18:45:13 -07:00
agent/api Merge branch '2.2.y' 2011-08-22 20:28:30 -07:00
alert api refactoring 2010-11-21 12:00:21 -08:00
api Merge branch '2.2.y' 2011-08-22 20:28:30 -07:00
async Add license header to files 2011-04-14 11:23:14 -07:00
capacity Bug 7845 - Productize DeploymentPlanner 2011-02-28 13:47:51 -08:00
cluster bug 9127: intermediate checkin for agent load balancer 2011-05-24 18:45:00 -07:00
configuration 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
consoleproxy api refactoring 2010-11-21 12:00:21 -08:00
dao api refactoring 2010-11-21 12:00:21 -08:00
dc Merging changes from zonesfeature branch for Bug 8026 - discern proper cluster/pod/zone for added host (and refactor AgentManagerImpl) 2011-04-28 23:08:58 -07:00
deploy bug 10640: Redundant virtual router: Try to deploy the second virtual router to different pod/cluster/host/storagepool 2011-07-19 15:06:15 -07:00
domain bug 10409: added domainSuffix parameters to account/domain objects 2011-07-15 14:40:39 -07:00
event bug 10561: intermidiate checkin for FirewallRuleFeature 2011-08-09 15:51:56 -07:00
exception bug 11043: Propagating fix 2011-08-11 10:30:03 -07:00
host Bug 10197: 2011-08-02 17:29:16 -07:00
hypervisor Merge branch 'cvm' into 2.2.y 2011-08-19 16:08:35 -07:00
network bug 11204: when search for domR/dhcp, include Role to the corresponding search to eliminate getting "LB" network element in the response 2011-08-23 12:05:53 -07:00
offering bug 10305: for a systemvm only applicable system vm offering should be displayed 2011-06-20 20:11:50 +05:30
org bug 10197: 2011-07-19 15:49:48 -07:00
projects Intermidiate checkin for Projects feature; added 3 new apis - create/delete/listProject(s) - as a part of checkin 2011-07-01 13:19:12 -07:00
resource bug 10197: 2011-07-19 15:44:37 -07:00
serializer bug 3179: added "count" parameter to the response to all List* api commands 2011-04-01 19:29:08 -07:00
server bug 10848: Introducing an api - ListCapacityByType. 2011-08-06 20:09:07 +05:30
storage Merge branch 'cvm' into 2.2.y 2011-08-19 16:08:35 -07:00
template Add prepareTemplate command(admin only) to allow pre-loading template into primary storage 2011-08-08 18:45:47 -07:00
user bug 10409: added domainSuffix parameters to account/domain objects 2011-07-15 14:40:39 -07:00
uservm bug 8962: moving vm from one account to other 2011-06-09 15:02:47 +05:30
vm Merge branch '2.2.y' 2011-08-22 20:28:30 -07:00