..
account
Patch from Chip Childers
2012-07-02 09:51:21 -04:00
acl
All merge conflicts resolved
2013-01-18 12:14:57 -08:00
agent
CLOUDSTACK-2056: DeploymentPlanner choice via ServiceOffering
2013-05-16 15:02:17 -07:00
alert
merge master
2013-05-11 15:28:43 +05:30
api
CLOUDSTACK-2056: DeploymentPlanner choice via ServiceOffering
2013-05-16 15:02:17 -07:00
async
merge master
2013-05-11 15:28:43 +05:30
capacity
CLOUDSTACK-2056: DeploymentPlanner choice via ServiceOffering
2013-05-16 15:02:17 -07:00
cluster
merge master
2013-05-11 15:28:43 +05:30
configuration
CLOUDSTACK-2056: DeploymentPlanner choice via ServiceOffering
2013-05-16 15:02:17 -07:00
consoleproxy
instead of using '==', use equals() to test Long value equality
2013-05-16 16:00:02 +08:00
dao
CLOUDSTACK-786, CLOUDSTACK-1014: Moved usage APIs to cloud-api. Removed ManagementServerExt. Usage API related implementation is added to UsageServiceImpl
2013-02-05 16:49:34 +05:30
deploy
CLOUDSTACK-2056: DeploymentPlanner choice via ServiceOffering
2013-05-16 15:02:17 -07:00
event
Retire unused files to avoid confusions
2013-04-02 15:55:41 -07:00
ha
Removing ^M's from code.
2013-04-04 00:53:20 +05:30
hypervisor
merge master
2013-05-11 15:28:43 +05:30
keystore
merge master
2013-05-11 15:28:43 +05:30
metadata
license check
2013-05-12 14:42:59 +05:30
network
PVLAN : Implementing PVLAN deployment capability for VMware deployments in cloudstack.
2013-05-16 14:50:16 -07:00
projects
merge master
2013-05-11 15:28:43 +05:30
resource
CLOUDSTACK-2056: DeploymentPlanner choice via ServiceOffering
2013-05-16 15:02:17 -07:00
resourcelimit
CLOUDSTACK-2116
2013-05-15 18:05:01 +05:30
secstorage
merge master
2013-05-11 15:28:43 +05:30
server
CLOUDSTACK-2056: DeploymentPlanner choice via ServiceOffering
2013-05-16 15:02:17 -07:00
servlet
merge master
2013-05-11 15:28:43 +05:30
storage
CLOUDSTACK-2519: VMs on local storage incorrectly destroyed when removing another host using deleteHost API
2013-05-15 13:28:41 -07:00
tags
merge with master
2013-05-13 16:36:41 +05:30
template
instead of using '==', use equals() to test Long value equality
2013-05-16 16:00:02 +08:00
test
instead of '==', use equals() to compare two strings in cloud-server
2013-05-16 16:18:53 +08:00
usage
merge master
2013-05-11 15:28:43 +05:30
user
merge master
2013-05-11 15:28:43 +05:30
uuididentity
When UUID field is null for existing records, set it to id
2013-05-14 15:11:41 -07:00
vm
CLOUDSTACK-2056: DeploymentPlanner choice via ServiceOffering
2013-05-16 15:02:17 -07:00