Kris McQueen
adce18b2c0
[merge from 2.1.x] Bug 5781: Only grab capacity global lock when accessing capacity tables. Once the queries are done, release the lock so that others can query for the data or update the data as needed.
2010-08-23 13:41:03 -07:00
Kelven Yang
f98e272d48
Remove an incorrect usage of @inject, it caused management server from being loaded
2010-08-23 12:25:47 -07:00
Kelven Yang
08ae56d360
Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
...
Conflicts:
api/src/com/cloud/hypervisor/Hypervisor.java
build/build-cloud.xml
2010-08-23 12:12:45 -07:00
kishan
89cd3131bf
add zone id for create template event
2010-08-23 17:19:31 +05:30
Kelven Yang
7bcff5acf3
Vmware incremental check-in
2010-08-20 18:50:33 -07:00
Jessica Wang
65b9f29941
Issue #: 5975
...
(1) API-side: make listDomains, ListDomainChildren return all items
(2) UI-side: make domains page show all domains by specifying pageSize=-1
2010-08-20 17:39:40 -07:00
Alex Huang
417a3c8c18
bug 5764: More changes
2010-08-19 11:27:30 -07:00
Kelven Yang
ff02e07a33
Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
2010-08-18 21:44:37 -07:00
Anthony Xu
41f7c745bd
bug 5934: if it is standalone, give cluser name as Standalone-ip/name
...
status 5934: resolved fixed
Conflicts:
server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
2010-08-18 17:33:25 -07:00
Kelven Yang
792fdf91b8
1) Add host_master table for tracking VMWare vShpere servers
...
2) Add SynchronizationEvent for in-process event synchronization
3) Move VMware files out of FOSS code base
2010-08-18 17:30:11 -07:00
Alex Huang
b250b985ec
changes
2010-08-18 12:19:22 -07:00
kishan
d202ce4c7a
Issue #: 5775
...
Release vnet and private IP allocation when domR fails to start
2010-08-18 19:43:16 +05:30
kishan
fb8e3ffec5
Merge branch 'master' of ssh://kishan@git.cloud.com/var/lib/git/cloudstack-oss
2010-08-18 14:09:13 +05:30
kishan
ef41ebc9ec
Check for null vnet when allocation fails
2010-08-18 13:54:53 +05:30
nitin
5331e13bac
5844 - adding more tags to updateTemplate API
2010-08-18 12:44:27 +05:30
Kelven Yang
53097c67f5
1) Fix build problem caused by alex's Refactoring
...
2) Let console proxy servlet support API key to allow session-less access
2010-08-17 15:15:06 -07:00
Alex Huang
a89aad4d15
removed override
2010-08-17 10:16:16 -07:00
Alex Huang
c5f822ca7a
Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
2010-08-16 11:30:22 -07:00
Alex Huang
c21bc7072c
more changes
2010-08-16 11:30:04 -07:00
Alex Huang
867b43dcf9
more changes for the rewrite.
2010-08-16 11:28:11 -07:00
edison
900b9e2f2f
Merge branch 'addhost'
2010-08-13 23:26:16 -07:00
edison
53df26daaa
"Add host" for kvm:
...
The sequence:
1. add host in UI
2. scp setup_agent.sh to agent host, and execute it. This script receives hostip,zoneid, podid and guid, then runs "cloud-setup-agent" and "cloud-setup-console-proxy". Here, we assume that network/hostname and cloud-agent are already configed and installed.
3. Write a dummy kvm resource into the database, then wait for agent connects to server, by polling the database for every 1 minutes. If it finds the agent is in UP state in database, then return, or wait for at least 10 minutes.
2010-08-13 23:19:36 -07:00
abhishek
5326d0ec89
bug 5922: Checking if bug db updates works
...
status 5922: resolved fixed
2010-08-13 14:07:55 -07:00
abhishek
7d14dd7576
Issue :# 5922
...
Status 5922: Resolved Fixed
Fix for 5922
2010-08-13 13:55:33 -07:00
abhishek
d8cc85c42f
Fixing the listAlerts api call to return the correct format for the sent on field
2010-08-12 15:52:34 -07:00
edison
dc005b9b9c
add setup_agent.sh, the first script running during add host
...
Make cloud-setup-agent/console-proxy in unattended mode
2010-08-11 19:31:07 -07:00
Kris McQueen
c49cdb21d8
Remove comment from testing Git and Eclipse
2010-08-11 13:55:05 -07:00
Kris McQueen
2a2d618da9
Add a comment for testing Git and Eclipse
2010-08-11 13:54:07 -07:00
Manuel Amador (Rudd-O)
05c020e1f6
Source code committed
2010-08-11 09:13:29 -07:00
