apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 11:52:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
148 Commits 307 Branches 324 Tags
Commit Graph

49 Commits

Author SHA1 Message Date
will
f8c93cd5fa Bug #:5975 
Merge from 2.1.x

- Fixed issue where listAccounts only return one less than the actual number of accounts in the system.  That is because the SQL query asks for X accounts, but the API filters out the SYSTEM account.  The fix is to add the filter of the system account in the actual query itself rather than have the code do it.

Conflicts:

	server/src/com/cloud/api/commands/ListAccountsCmd.java
 2010-08-25 18:21:32 -07:00
edison
3ab4651cf0 Issue #: 5978 5977 5971 5972 
Status 5978: resolved fixed
Status 5977: resolved fixed
Status 5971: resolved fixed
Status 5972: resolved fixed
 2010-08-25 15:27:34 -07:00
Kelven Yang
0682d70ce6 add correct check sum to default vmware template records 
Let StoragePoolMonitor be aware of vmware hypervisor
 2010-08-25 11:07:27 -07:00
Kelven Yang
0a401f7b91 Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2010-08-25 09:40:57 -07:00
nit
6ae72df46a bug 5905: Adding deviceId tag to the ListVolumes command when the volume is attached. status 5905: closed fixed 2010-08-25 11:44:54 +05:30
Kelven Yang
45cb68e7e2 add templates.vmware.sql 
modify build to deploy vmware database records
 2010-08-24 22:58:05 -07:00
Kelven Yang
49900a8985 1) Add VMDK format 
2) Make console proxy servlet explictly return content-type header for console proxy page (this is a bug fix change)
 2010-08-24 18:58:38 -07:00
jessica
895fb85162 check in for Alex. 2010-08-24 15:48:40 -07:00
Alex Huang
415bc8ae20 bug 5764: checkin before I switch to work on 2.1.x 2010-08-24 14:40:29 -07:00
Alex Huang
fb389e8cd6 Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2010-08-24 00:01:09 -07:00
Alex Huang
20b26082db bug 5764: changing from networkoffering to network profile 2010-08-24 00:00:43 -07:00
Anthony Xu
55e425361d Merge branch 'lmaster' 2010-08-23 18:13:33 -07:00
Anthony Xu
0366dd093c use slaveconnection instead of masterconnection for all host plugin calls. 
tested by creating domr and user vm and migrating them

1. if you add host for kvm , you need specify kvm://ip_address, otherwiset there is no to differ kvm and xenserver hosts, edison cloud you please test this, may need some minor fixes.

2. if you want to session inside your plugin call, you can not use the one which is passed in, due to it is a slavesession, you need to call get_xapi_session() to get a new local session and use it. I have modified some of these, I may ignore some. Please let me know if you see XENAPI_PLUGIN_EXCEPTION.
 2010-08-23 18:01:39 -07:00
abhishek
7f771cbe24 bug 5883: Final checkin for volume lineage 
status 5853: RESOLVED FIXED
 2010-08-23 16:17:18 -07:00
abhishek
7454f0f24a Incremental checkin for volume lineage 2010-08-23 16:02:45 -07:00
Alex Huang
e91617bc6f Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2010-08-23 15:10:15 -07:00
Alex Huang
bb06bc3d57 fixed merge conflict 2010-08-23 15:10:08 -07:00
abhishek
27b038efcb Correcting hypervisor type enum 2010-08-23 14:07:35 -07:00
Alex Huang
e0165dd2ef my changes 2010-08-23 13:59:23 -07:00
root
d2ffa6b68d bug 5781: also reduce the scope of the global lock when updating storage capacity. 2010-08-23 13:41:22 -07:00
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