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
frank
88b863d6e3
Bug 11522 - New agent manager
...
Initialize unit test case for resource manager
2011-10-07 15:51:24 -07:00
Edison Su
ae83246acb
bug 11600: aquirelock before deleting a volume, which can be aquired by snapshot manager
...
status 11600: resolved fixed
2011-10-03 16:43:47 -07:00
Edison Su
eacb9dde26
[Simulator] Add API to configure simualtor: you can configure which command can be simulated, or how long it will wait for each command, for which zone/pod/cluster/host etc.
...
e.g: command=configuresimulator&name=SecurityIngressRulesCmd&zoneid=1&value=enabled:true|timeout=30, means enable command SecurityIngressRulesCmd for zone 1, and wait for 30 seconds.
2011-09-30 18:21:28 -07:00
frank
d36a988d84
move simulator/test to opensource
2011-08-24 10:37:30 -07:00
