13 Commits

Author SHA1 Message Date
Kelven Yang
cea8f3bf37 Switch inject annotation to javax and let ComponentLocator to recognize both the new and original inject annotation 2012-11-07 15:03:22 -08:00
Kelven Yang
aab02e2743 Add Spring annotation to major components 2012-11-07 14:53:39 -08:00
David Nalley
e87558256c Patch from Chip Childers
https://reviews.apache.org/r/5704/
License header updates for the server folder
2012-07-02 09:51:21 -04:00
frank
2f634c0913 Switch to Apache license 2012-04-03 04:50:05 -07:00
frank
f449cd7350 Bug 12771 - management-server.log displays ipmi related credentials in plain text
status 12771: resolved fixed
2012-01-09 14:42:01 -08:00
frank
6a7d99fc77 Bug 12219 - Cant add baremetal host
status 12219: resolved fixed
2011-11-29 11:46:46 -08:00
frank
fec9cc86af allow multiple clusters for baremetal 2011-10-28 13:47:21 -07:00
frank
1ef620121a Use constant string instead of hard coding in baremetal parameters passing
Conflicts:

	server/src/com/cloud/baremetal/BareMetalDiscoverer.java
2011-10-28 11:07:28 -07:00
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
cfebd04df0 Bug 11805 - Cant add baremetal host
status 11805: resolved fixed
2011-10-25 15:18:55 -07:00
frank
e5fca855c1 Bug 11522 - New agent manager
register/unregister resource state adapter in configure/stop of implementations
2011-09-27 11:51:03 -07:00
frank
e0e5491c42 Bug 11522 - New agent manager
implements ResourceStateAdapter in a couple of components
2011-09-23 11:28:02 -07:00
frank
b3478c377e Full opensource 2011-08-23 19:52:19 -07:00