Kris McQueen 848ce60097 Merging master into 2.1.refactor, resolve the merge conflicts as best I can. New commands related to extracting template/iso/volume and related to instance groups were refactored to the new API framework.		2010-09-28 15:47:14 -07:00
..
agent/manager	Merging master into 2.1.refactor, resolve the merge conflicts as best I can. New commands related to extracting template/iso/volume and related to instance groups were refactored to the new API framework.	2010-09-28 15:47:14 -07:00
alert	bug 6181: ingore provisioning factor for iscsi primary storage	2010-09-22 20:39:57 -07:00
api	Merging master into 2.1.refactor, resolve the merge conflicts as best I can. New commands related to extracting template/iso/volume and related to instance groups were refactored to the new API framework.	2010-09-28 15:47:14 -07:00
async	Merging master into 2.1.refactor, resolve the merge conflicts as best I can. New commands related to extracting template/iso/volume and related to instance groups were refactored to the new API framework.	2010-09-28 15:47:14 -07:00
cluster	cleaning up imports, fixing up some compilation problems related to API refactoring	2010-09-13 15:25:46 -07:00
configuration	Merging master into 2.1.refactor, resolve the merge conflicts as best I can. New commands related to extracting template/iso/volume and related to instance groups were refactored to the new API framework.	2010-09-28 15:47:14 -07:00
consoleproxy	Merging master into 2.1.refactor, resolve the merge conflicts as best I can. New commands related to extracting template/iso/volume and related to instance groups were refactored to the new API framework.	2010-09-28 15:47:14 -07:00
deploy	more changes	2010-09-22 10:43:59 -07:00
event	cleaning up imports, fixing up some compilation problems related to API refactoring	2010-09-13 15:25:46 -07:00
ha	Merging master into 2.1.refactor, resolve the merge conflicts as best I can. New commands related to extracting template/iso/volume and related to instance groups were refactored to the new API framework.	2010-09-28 15:47:14 -07:00
hypervisor	Merging master into 2.1.refactor, resolve the merge conflicts as best I can. New commands related to extracting template/iso/volume and related to instance groups were refactored to the new API framework.	2010-09-28 15:47:14 -07:00
maid	renamed dao methods to correctly reflect what they do	2010-09-09 18:01:50 -07:00
maint	bug 4898: removing the upgrade.url param	2010-08-30 14:49:22 -07:00
migration	Merging master into 2.1.refactor, resolve the merge conflicts as best I can. New commands related to extracting template/iso/volume and related to instance groups were refactored to the new API framework.	2010-09-28 15:47:14 -07:00
network	Merging master into 2.1.refactor, resolve the merge conflicts as best I can. New commands related to extracting template/iso/volume and related to instance groups were refactored to the new API framework.	2010-09-28 15:47:14 -07:00
offerings/dao	More changes for refactoring	2010-09-15 18:00:54 -07:00
resource	"Add host" for kvm:	2010-08-13 23:19:36 -07:00
server	Merging master into 2.1.refactor, resolve the merge conflicts as best I can. New commands related to extracting template/iso/volume and related to instance groups were refactored to the new API framework.	2010-09-28 15:47:14 -07:00
servlet	Merging master into 2.1.refactor, resolve the merge conflicts as best I can. New commands related to extracting template/iso/volume and related to instance groups were refactored to the new API framework.	2010-09-28 15:47:14 -07:00
storage	Merging master into 2.1.refactor, resolve the merge conflicts as best I can. New commands related to extracting template/iso/volume and related to instance groups were refactored to the new API framework.	2010-09-28 15:47:14 -07:00
template	Merging master into 2.1.refactor, resolve the merge conflicts as best I can. New commands related to extracting template/iso/volume and related to instance groups were refactored to the new API framework.	2010-09-28 15:47:14 -07:00
test	Merging master into 2.1.refactor, resolve the merge conflicts as best I can. New commands related to extracting template/iso/volume and related to instance groups were refactored to the new API framework.	2010-09-28 15:47:14 -07:00
user	Merging master into 2.1.refactor, resolve the merge conflicts as best I can. New commands related to extracting template/iso/volume and related to instance groups were refactored to the new API framework.	2010-09-28 15:47:14 -07:00
vm	Merging master into 2.1.refactor, resolve the merge conflicts as best I can. New commands related to extracting template/iso/volume and related to instance groups were refactored to the new API framework.	2010-09-28 15:47:14 -07:00