Commit Graph

19 Commits

Author SHA1 Message Date
anthony 46dac852fa Merge branch 'swift'
Conflicts:
	server/src/com/cloud/agent/AgentManager.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
2011-10-31 15:04:48 -07:00
frank 3e5f63f08b Bug 11863 - OVM - attempt to add host which is already added to same or different cluster does not generate UI error
status 11863: resolved fixed
2011-10-28 17:41:15 -07:00
frank 21de281276 Fix broken compilation by new anget manager merge 2011-10-27 11:24:10 -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 cb3c2699b7 Add Solaris support for Ovm
Conflicts:

	setup/db/templates.sql
2011-10-25 18:12:18 -07:00
frank 628a88a3e9 Bug 11740 - OVM - after Primary storage OCFS2 with ISCSI path has been removed, attempt to add back same ISCSI path to Primary storage OCFS2 failed
status 11740: resolved fixed
2011-10-17 13:56:13 -07:00
frank 8decef98fd Bug 11741 - there is no ovm.public.network.device, ovm.private.network.device, ovm.guest.network.device in global configure page
status 11741: resovled fixed
2011-10-14 11:42:54 -07:00
frank cd6b872f8d Bug 11670 - OVM - HA failed when host is disconnected from network
status 11670: resolved fixed
2011-10-13 14:46:36 -07:00
frank 791cde1948 Bug 11646 - OVM - volume > download volume failed for both ROOT and DATA volumes
status 11646: resolved fixed
2011-10-12 16:46:46 -07:00
frank 63814ff9cf Bug 11648 - OVM - volume > create template FAIL
handle specific vm.cfg file
2011-10-12 12:00:49 -07:00
frank 1710c2f684 Bug 11648 - OVM - volume > create template FAIL
status 11648: resolved fixed
2011-10-11 17:42:37 -07:00
frank a0c9fde7cc Bug 11649 - OVM - unable to add OVM host to second zone
status 11649: resolved fixed
2011-10-10 10:31:58 -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 806c70c87f Bug 8966 - Oracle VM (OVM) support
fix a ovs agent bug, wrong return value check
2011-08-31 17:25:11 -07:00
frank 0c0fe8c1b3 Bug 8966 - Oracle VM (OVM) support
configure hostname of host for OCFS2
small fixes
2011-08-31 17:25:04 -07:00
anthony f47bf2e4cf fixed eclipse classpath 2011-08-31 13:35:37 -07:00
frank 32cb4da2f3 add classpath and project file for ovm 2011-08-30 15:59:39 -07:00
frank b3478c377e Full opensource 2011-08-23 19:52:19 -07:00