cloudstack/server/src/com/cloud
alena 012f097885 Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
Conflicts:
	core/src/com/cloud/server/ManagementServer.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
2010-09-14 19:57:26 -07:00
..
agent/manager execute only emergency command with slaveconn. othersiwe api call hands 2010-09-14 19:22:24 -07:00
alert renamed dao methods to correctly reflect what they do 2010-09-09 18:01:50 -07:00
api bug 6177: Make VM group a first class object 2010-09-14 19:08:01 -07:00
async bug 6177: Make VM group a first class object 2010-09-14 19:08:01 -07:00
cluster Source code committed 2010-08-11 09:13:29 -07:00
configuration bug 6188: fix for the issue 2010-09-14 15:33:48 -07:00
consoleproxy renamed dao methods to correctly reflect what they do 2010-09-09 18:01:50 -07:00
ha Source code committed 2010-08-11 09:13:29 -07:00
hypervisor execute only emergency command with slaveconn. othersiwe api call hands 2010-09-14 19:22:24 -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 renamed dao methods to correctly reflect what they do 2010-09-09 18:01:50 -07:00
network renamed dao methods to correctly reflect what they do 2010-09-09 18:01:50 -07:00
offerings/dao bug 5764: changing from networkoffering to network profile 2010-08-24 00:00:43 -07:00
resource "Add host" for kvm: 2010-08-13 23:19:36 -07:00
server Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2010-09-14 19:57:26 -07:00
servlet add templates.vmware.sql 2010-08-24 22:58:05 -07:00
storage further improvements to the sp code, especially for the local storage case 2010-09-13 12:00:54 -07:00
template renamed dao methods to correctly reflect what they do 2010-09-09 18:01:50 -07:00
test adding the status value whilst creating a storage pool using database config 2010-09-14 11:37:32 -07:00
user my changes 2010-08-23 13:59:23 -07:00
vm Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2010-09-14 19:57:26 -07:00