Commit Graph

96 Commits

Author SHA1 Message Date
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 f8e7b3ff5f.
2010-08-18 00:35:49 -07:00
Manuel Amador (Rudd-O) 467a435659 Revert "Correct name of cloud-qemu package"
This reverts commit b3cf83c94e.
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
Anthony Xu 334b2f7d27 bug 5939: script to clean xenstore disk 2010-08-16 17:06:20 -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
Kelven Yang e78f05599c Test verification with vim2.5 2010-08-16 11:12:11 -07:00
abhishek b4d6baf044 Fixing the multiplying factor issue 2010-08-16 10:05:46 -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
Jessica Wang 66ccd6f7ad (1) When hypervisor.type is kvm, allow option to add host in UI.
(2) When when hypervisor.type is kvm, hide cluster section in add host dialog.
2010-08-13 18:19:55 -07:00
will 7cf14dcffa Test commit 2010-08-13 16:36:30 -07:00
Anthony Xu 642d0dfe8a Issue #: 5917
if we found the SR, we'll never create it again.
2010-08-13 15:17:33 -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
edison su 59912c09c9 Remove the VHD template signature check when downdloading template.
There are lots tools can create VHD disk: xenserver, xenconverter, hyper-v, platespin, etc. And some tools didn't create a correct signature.
2010-08-13 12:09:50 -07:00
Manuel Amador (Rudd-O) 3acc84282f cannot use hardlink when we are using symlink 2010-08-13 01:01:50 -07:00
Manuel Amador (Rudd-O) 5a1fb90360 Performance and assurement improvements in wscript 2010-08-13 00:36:21 -07:00