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
25c2734e03
More stuff to Projects feature - added support for adding resources (vms, templates, isos) to the project
2011-10-05 13:24:25 -07:00
3947c9a126
Bug 11522 - New agent manager
...
Initailize SearchCriteria2 in order to replace search interface of DAO
2011-10-03 10:32:27 -07:00
9b424a762d
fix compilation of mocks
2011-09-13 09:22:52 -07:00
3cb4ad4934
Add more detail when unable to schedule cleanup
...
clean up tests for security group manager v2
move interval to listener -- allows it to be configurable if needed
fix mocks
Enhanced logging for security group manager (from zucchini)
fix merge issues
merge issues
2011-09-12 18:22:55 -07:00
2fc782b8ba
Add basic Mocks for some managers
2011-09-12 18:20:22 -07:00
frank
alena
frank
Chiradeep Vittal