Min Chen
93f14e7c65
Merge branch 'master' into vim51_win8
...
Conflicts:
client/tomcatconf/componentContext.xml.in
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
vmware-base/test/com/cloud/vmware/TestVMWare.java
2013-02-27 17:47:10 -08:00
Min Chen
36f4b44c36
Fix CLOUDSTACK-1425 and CLOUDSTACK-1399: Failed to load UserVmDaoImpl in
...
new Spring framework and register it into internal dao map.
2013-02-27 15:47:07 -08:00
Min Chen
8aba25f18d
Merge branch 'master' into vim51_win8
...
Conflicts:
setup/db/db/schema-410to420.sql
2013-02-26 14:12:36 -08:00
frank
c1d513ef12
CloudStack CLOUDSTACK-1382
...
vm deploy fails with Error "cannot find DeployPlannerSelector for vm"
adding configuration of DeployPlanSelector to nonossComponentContext.xml.in
fixed resolved
2013-02-25 16:07:50 -08:00
Min Chen
fbfc5c6894
Merge from master and fix conflicts
2013-02-25 11:53:24 -08:00
Mice Xia
79fee523bd
CloudStack CLOUDSTACK-774 add baremetal related class declaration in nonossComponentContext.xml
2013-02-22 15:56:54 +08:00
frank
1f15c1e9e7
CloudStack CLOUDSTACK-774
...
Supporting kickstart in CloudStack baremetal
fixing bugs to align to new code base
Conflicts:
client/tomcatconf/componentContext.xml.in
2013-02-21 15:42:38 -08:00
Min Chen
c0442e2556
Fix a bug in register template, cannot find template adapter.
2013-02-12 16:56:02 -08:00
Min Chen
12cbaad691
Remove duplicate bean for ApiRateLimitServiceImpl to make sure that only
...
one ApiChecker instance is injected in ApiServer.
2013-02-07 21:50:07 -08:00
Kelven Yang
e5866cf2ef
CLOUDSTACK-1165, fix nonoss build startup issue
2013-02-05 14:27:57 -08:00
Kelven Yang
767f54cc9a
Make nonoss build work under Spring
2013-01-25 17:18:36 -08:00
Kelven Yang
2b67fc8441
Add nonossComponentContext.xml.in for nooss composition of CloudStack
2013-01-25 15:48:25 -08:00
