cloudstack/api/src/com/cloud
frank cef30956e9 Merge branch 'newagentmgr'
Conflicts:
	agent-simulator/src/com/cloud/api/commands/ConfigureSimulator.java
	ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/capacity/CapacityManagerImpl.java
	server/src/com/cloud/network/F5BigIpManagerImpl.java
	server/src/com/cloud/network/JuniperSrxManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/db/GenericDao.java
2011-10-27 11:09:56 -07:00
..
acl More stuff to Projects feature - added support for adding resources (vms, templates, isos) to the project 2011-10-05 13:24:25 -07:00
agent/api Merge branch 'newagentmgr' 2011-10-27 11:09:56 -07:00
alert api refactoring 2010-11-21 12:00:21 -08:00
api Merge branch 'newagentmgr' 2011-10-27 11:09:56 -07:00
async Add license header to files 2011-04-14 11:23:14 -07:00
capacity bug 10893: Adding a new capacity type - Local Primary storage. 2011-10-27 11:22:18 +05:30
cluster bug 9127: intermediate checkin for agent load balancer 2011-05-24 18:45:00 -07:00
configuration Intermidiate checkin to Project feature: 2011-09-20 18:35:28 -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 More stuff to Projects feature - added support for adding resources (vms, templates, isos) to the project 2011-10-05 13:24:25 -07:00
event Bug 9949 - revert VM to template 2011-10-25 13:52:39 -07:00
exception 1) Added resource limits for the Projects - the same as for the account 2011-09-21 17:09:49 -07:00
host Bug 11522 - New agent manager 2011-10-24 16:49:32 -07:00
hypervisor Bug 11200 - maximum number of guests per host 2011-09-07 14:53:05 -07:00
network More stuff to Projects feature - added support for adding resources (vms, templates, isos) to the project 2011-10-05 13:24:25 -07:00
offering bug 11260: Take networkRate for domR's guest and public interface from the corresponding system service offering 2011-08-25 14:15:12 -07:00
org bug 10197: 2011-07-19 15:49:48 -07:00
projects Made all project commands except list* to be Async 2011-10-20 11:30:45 -07:00
resource Bug 11522 - New agent manager 2011-10-21 18:06:06 -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: ListCapacity - Full rework. This fixes the pagination logic and the capacities are visible till the cluster level. 2011-10-27 11:18:56 +05:30
storage bug 10803: using updatehost api to change secondary storage url, the url need to be nfs://host/path format 2011-10-26 16:27:28 -07:00
template More stuff to Projects feature - added support for adding resources (vms, templates, isos) to the project 2011-10-05 13:24:25 -07:00
user More stuff to Projects feature - added support for adding resources (vms, templates, isos) to the project 2011-10-05 13:24:25 -07:00
uservm bug 8962: moving vm from one account to other 2011-06-09 15:02:47 +05:30
vm Bug 9949 - revert VM to template 2011-10-25 13:52:39 -07:00