apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
112 Commits 304 Branches 324 Tags
Commit Graph

112 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
c17cda2a37 resolve failed merge markers 2010-08-20 18:15:24 -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
jessica
440662c938 Issue #: 5986 
Volume page - grid - make action links stay left-aligned
 2010-08-20 17:31:59 -07:00
Edison Su
bf3db195ed fix typo 2010-08-20 18:51:17 -04:00
Alex Huang
4cda798057 Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2010-08-20 14:51:48 -07:00
Manuel Amador (Rudd-O)
40a78f166e build-cloud.xml build-cloud FAILS until now. It had references to files in directories that were moved. 2010-08-20 14:02:41 -07:00
Alex Huang
0f7a7f0879 merge 2010-08-20 13:38:24 -07:00
Alex Huang
4356eb7c26 Start2Command implementation for xenserver 2010-08-20 13:35:08 -07:00
Manuel Amador (Rudd-O)
b9e600ed53 Remove the unnecessary excludes from build-ui 2010-08-20 13:21:19 -07:00
Manuel Amador (Rudd-O)
6b08c8afc3 Add thirdparty jars because otherwise the premium parts that do VMWare do not compile 2010-08-20 13:07:16 -07:00
Manuel Amador (Rudd-O)
ea58879032 Remove build.number 2010-08-20 13:06:40 -07:00
Manuel Amador (Rudd-O)
eae268d5d9 Undo unnecessary reformatting that is complicating the merges 2010-08-20 12:24:59 -07:00
Jessica Wang
f0b82f8565 move source of resource properties from UI folder to client folder 
move source of resource properties from UI folder to client folder

move source of resource properties from UI folder to client folder
 2010-08-20 12:08:47 -07:00
Alex Huang
24ccf442b0 Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2010-08-19 11:28:05 -07:00
Alex Huang
417a3c8c18 bug 5764: More changes 2010-08-19 11:27:30 -07:00
Manuel Amador (Rudd-O)
04d0feb475 Gitignore ignores pyc ocmpiled files and build.number 2010-08-19 10:57:16 -07:00
Manuel Amador (Rudd-O)
e94d21be0f Remove cloud_utils.pyc 2010-08-19 10:50:39 -07:00
Manuel Amador (Rudd-O)
b96544e475 read_properties imported from cloud_utils 2010-08-19 10:50:38 -07:00
Manuel Amador (Rudd-O)
dc1d43815f Requires of cloud-qemu-system-x86 correct 2010-08-19 10:50:38 -07:00
Alex Huang
afc0adf28a security checker 2010-08-19 09:23:03 -07:00
Alex Huang
52e6f3a85b Added '/' to gitignore 2010-08-19 09:04:10 -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
edison
3106c2ae3f Issue #: 5954 
Status 5954: resolved fixed
exclude link local gateway
 2010-08-18 17:44:39 -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
Anthony Xu
09680d80a7 bug 5939: add the new script to patch 
status 5939: assigned
 2010-08-18 16:59:04 -07:00
Alex Huang
f3fa6e22e2 Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2010-08-18 12:28:51 -07:00
Alex Huang
20ffe6f13d more changes 2010-08-18 12:28:30 -07:00
Alex Huang
b250b985ec changes 2010-08-18 12:19:22 -07:00
Jessica Wang
275785404c Add Host - vlidate cluster section only if xenserver is xenserver 2010-08-18 11:30:01 -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
nit
ddbdb880e6 Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2010-08-18 13:46:11 +05:30
Manuel Amador (Rudd-O)
b70307eb1a Revert "Added cloud-qemu-system dependency on packages" 
This reverts commit f8e7b3ff5ff767bfcfd9b8004a4916a9350da953.
 2010-08-18 00:35:49 -07:00
Manuel Amador (Rudd-O)
467a435659 Revert "Correct name of cloud-qemu package" 
This reverts commit b3cf83c94eef6540198009b65af3b4cf48fac78e.
 2010-08-18 00:35:38 -07:00
nitin
5331e13bac 5844 - adding more tags to updateTemplate API 2010-08-18 12:44:27 +05:30
Manuel Amador (Rudd-O)
b3cf83c94e Correct name of cloud-qemu package 2010-08-17 15:44:06 -07:00
Manuel Amador (Rudd-O)
f8e7b3ff5f Added cloud-qemu-system dependency on packages 2010-08-17 15:40:25 -07:00
Kelven Yang
627e65e102 Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2010-08-17 15:16:49 -07:00
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
Jessica Wang
1849d4a6b1 Issue #: 5894 
Create Template from Snapshot dialog - add password dropdown field
 2010-08-17 14:25:54 -07:00
Chiradeep Vittal
b104bbb511 ignore override and bin and logfiles properly 2010-08-17 11:09:12 -07:00
Alex Huang
e077b23d98 stupid git 2010-08-17 10:26:34 -07:00
Alex Huang
a89aad4d15 removed override 2010-08-17 10:16:16 -07:00