etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server/src/com/cloud
History
Min Chen 613a061977 Merge branch 'master' into vim51_win8 
Conflicts:
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
 		2013-03-04 17:32:52 -08:00
..
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-711: Cpu and Ram Overcommit Ratio. 2013-02-22 17:31:06 +05:30
alert squash changes into one giant patch 2013-02-21 11:22:48 -08:00
api CLOUDSTACK-1449: listAccounts and listProjectAccounts API lists all the users not account-specific users for each account returned. 2013-03-04 14:42:32 -08:00
async Improve component lifecycle management with system run-level concept 2013-01-30 15:21:02 -08:00
baremetal Merge from master and fix conflicts 2013-02-25 11:53:24 -08:00
capacity CLOUDSTACK-1401 NPE: listCapacity 2013-02-28 11:46:10 +08:00
certificate/dao Add Spring annotation to major components 2012-11-07 14:53:39 -08:00
cluster CLOUDSTACK-724: add basic zone wide storage support, refactor storage allocator, need ui support 2013-02-26 18:39:23 -08:00
configuration Revert "CLOUDSTACK-658 - Adding Scalevm command and XS related changes" 2013-03-04 23:32:52 +05:30
consoleproxy squash changes into one giant patch 2013-02-21 11:22:48 -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
dc CLOUDSTACK-1332: Pass IPv6 DNS to VR 2013-02-25 16:08:15 -08:00
deploy CLOUDSTACK-724: add basic zone wide storage support, refactor storage allocator, need ui support 2013-02-26 18:39:23 -08:00
domain Sync master to javelin one more time 2013-02-01 11:37:33 -08:00
event CLOUDSTACK-1391: EventBus is not getting injected after javelin merge 2013-02-27 18:55:22 +05:30
ha squash changes into one giant patch 2013-02-21 11:22:48 -08:00
host/dao CLOUDSTACK-724: add basic zone wide storage support, refactor storage allocator, need ui support 2013-02-26 18:39:23 -08:00
hypervisor Cloudstack-711: Cpu and Ram Overcommit Ratio. 2013-02-22 17:31:06 +05:30
keystore Improve component lifecycle management with system run-level concept 2013-01-30 15:21:02 -08:00
maint Improve component lifecycle management with system run-level concept 2013-01-30 15:21:02 -08:00
migration CLOUDSTACK-745: Reset a VM on reboot. On every reboot of VM, the root disk state is reset. This is for the VMs created using service offering where an optional parameter isvolatile is set true. 2013-02-21 14:59:35 +05:30
network CLOUDSTACK-24: mipn feature for isolated and vpc networks 2013-03-04 11:02:09 +05:30
offerings Merge javelin into master 2013-02-01 14:40:45 -08:00
projects CLOUDSTACK-241: Removed API based account sync. Removed all the related API changes and RegionsAPIUtil. 2013-02-26 14:21:21 +05:30
resource Re-basing with latest master. 2013-02-27 18:37:15 +05:30
resourcelimit CLOUDSTACK-713: Limit Resources(CPU and Memory) to domain/accounts 2013-02-12 12:02:07 -08:00
secstorage Bring javelin back to the status of being able to start System VMs after another round of master branch merge 2013-01-18 19:15:32 -08:00
server Revert "CLOUDSTACK-658 - Adding Scalevm command and XS related changes" 2013-03-04 23:32:52 +05:30
service CLOUDSTACK-745: Reset a VM on reboot. On every reboot of VM, the root disk state is reset. This is for the VMs created using service offering where an optional parameter isvolatile is set true. 2013-02-21 14:59:35 +05:30
servlet Improve component lifecycle management with system run-level concept 2013-01-30 15:21:02 -08:00
storage CLOUDSTACK-1391: EventBus is not getting injected after javelin merge 2013-02-27 18:55:22 +05:30
tags squash changes into one giant patch 2013-02-21 11:22:48 -08:00
template Merge from master and fix conflicts 2013-02-25 11:53:24 -08:00
test Fix issues after another round of merge 2013-01-11 16:54:32 -08:00
upgrade CLOUDSTACK-241: Moved regions upgrade changes to Upgrade40to41.jav from schema file. Sets the right regins_id from db.properties instead of using default 1. 2013-02-28 14:35:23 +05:30
usage 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
user CLOUDSTACK-962:setAggBytesSent/setAggBytesReceived in NetworkUsageTask when not in case of dailyor hourly 2013-02-26 16:27:59 +05:30
uuididentity Improve component lifecycle management with system run-level concept 2013-01-30 15:21:02 -08:00
vm Revert "CLOUDSTACK-658 - Adding Scalevm command and XS related changes" 2013-03-04 23:32:52 +05:30