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	more file changes	2010-09-09 13:27:20 -07:00
alert	Source code committed	2010-08-11 09:13:29 -07:00
async	Source code committed	2010-08-11 09:13:29 -07:00
capacity	Source code committed	2010-08-11 09:13:29 -07:00
cluster	Source code committed	2010-08-11 09:13:29 -07:00
configuration	Source code committed	2010-08-11 09:13:29 -07:00
consoleproxy	bug 5764: More changes	2010-08-19 11:27:30 -07:00
dc	bug 6163: refactoring some more code	2010-09-14 10:05:05 -07:00
domain	changes	2010-08-18 12:19:22 -07:00
event	more file changes	2010-09-09 13:27:20 -07:00
exception	Source code committed	2010-08-11 09:13:29 -07:00
ha	renamed dao methods to correctly reflect what they do	2010-09-09 18:01:50 -07:00
host	renamed dao methods to correctly reflect what they do	2010-09-09 18:01:50 -07:00
hypervisor	execute only emergency command with slaveconn. othersiwe api call hands	2010-09-14 19:22:24 -07:00
info	Source code committed	2010-08-11 09:13:29 -07:00
maid	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	more file changes	2010-09-09 11:52:12 -07:00
resource	changes	2010-08-18 12:19:22 -07:00
serializer	Source code committed	2010-08-11 09:13:29 -07:00
server	Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss	2010-09-14 19:57:26 -07:00
service	renamed dao methods to correctly reflect what they do	2010-09-09 18:01:50 -07:00
storage	further improvements to the sp code, especially for the local storage case	2010-09-13 12:00:54 -07:00
user	renamed dao methods to correctly reflect what they do	2010-09-09 18:01:50 -07:00
vm	bug 6177: Make VM group a first class object	2010-09-14 19:08:01 -07:00