cloudstack/server/src/com/cloud
Alena Prokharchyk 5a72044dc7 Merge branch 'master' into vpc 2012-08-03 14:30:54 -07:00
..
account Patch from Chip Childers 2012-07-02 09:51:21 -04:00
acl Patch from Chip Childers 2012-07-02 09:51:21 -04:00
agent Patch fixes file names and imports wherever used, in files introduced in 2012-07-31 10:38:11 -07:00
alert Patch from Chip Childers 2012-07-02 09:51:21 -04:00
api VPC: CS-15798 - added vpc resource limit. Check vpc functional spec for more details: 2012-08-01 18:57:33 -07:00
async Patch from Chip Childers 2012-07-02 09:51:21 -04:00
baremetal Move KVM related code into plugins/hypervisor/kvm, a new jar file is 2012-07-30 14:55:47 -07:00
capacity Patch from Chip Childers 2012-07-02 09:51:21 -04:00
certificate/dao Patch from Chip Childers 2012-07-02 09:51:21 -04:00
cluster Patch from Chip Childers 2012-07-02 09:51:21 -04:00
configuration VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr 2012-08-03 14:23:45 -07:00
consoleproxy bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager 2012-07-27 23:37:46 -04:00
dao Patch from Chip Childers 2012-07-02 09:51:21 -04:00
dc Merge branch 'master' into vpc 2012-07-06 12:04:10 -07:00
deploy ifix CS-15609 Volumes can be created as a part of VM creation when 2012-07-26 10:10:18 -07:00
domain Patch from Chip Childers 2012-07-02 09:51:21 -04:00
event Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ha VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr 2012-08-03 14:23:45 -07:00
host/dao Phase 1 of Nicira integration 2012-07-11 17:16:06 -07:00
hypervisor Merge branch 'master' into vpc 2012-08-01 19:04:28 -07:00
keystore Patch from Chip Childers 2012-07-02 09:51:21 -04:00
maint Patch from Chip Childers 2012-07-02 09:51:21 -04:00
migration Patch from Chip Childers 2012-07-02 09:51:21 -04:00
network Merge branch 'master' into vpc 2012-08-03 14:30:54 -07:00
offerings Merge branch 'master' into vpc 2012-07-03 17:32:50 -07:00
projects ResourceTags: resourcetags support for Project/Vpc/NetworkACL/StaticRoute 2012-08-01 18:54:08 -07:00
resource Patch fixes file names and imports wherever used, in files introduced in 2012-07-31 10:38:11 -07:00
resourcelimit VPC: CS-15798 - added vpc resource limit. Check vpc functional spec for more details: 2012-08-01 18:57:33 -07:00
secstorage Patch from Chip Childers 2012-07-02 09:51:21 -04:00
server Merge branch 'master' into vpc 2012-08-02 18:45:37 -07:00
service Patch from Chip Childers 2012-07-02 09:51:21 -04:00
servlet Patch from Chip Childers 2012-07-02 09:51:21 -04:00
storage Merge branch 'master' into vpc 2012-08-03 14:30:54 -07:00
tags ResourceTags: resourcetags support for Project/Vpc/NetworkACL/StaticRoute 2012-08-01 18:54:08 -07:00
template Patch from Chip Childers 2012-07-02 09:51:21 -04:00
test Merge branch 'master' into vpc 2012-08-02 18:45:37 -07:00
upgrade Removed @author tags in some classes 2012-08-03 14:25:17 -07:00
usage Patch from Chip Childers 2012-07-02 09:51:21 -04:00
user S2S VPN: CS-15748: Deleting customer vpn gateway when delete account 2012-07-30 15:34:41 -07:00
uuididentity ResourceTags: resourcetags support for Project/Vpc/NetworkACL/StaticRoute 2012-08-01 18:54:08 -07:00
vm Merge branch 'master' into vpc 2012-08-02 18:45:37 -07:00