38190 Commits

Author SHA1 Message Date
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
abhishek
2c670609b1 Merge branch '2.1.refactor' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.1.refactor 2010-08-18 16:15:09 -07:00
abhishek
66f51effd9 Refactoring startsystemvm cmd 2010-08-18 16:14:31 -07:00
alena
89179dd12e Api refactor 2010-08-18 16:00:31 -07:00
alena
46c331b54b Merge branch '2.1.refactor' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.1.refactor
Conflicts:
	server/src/com/cloud/storage/StorageManagerImpl.java
2010-08-18 15:52:23 -07:00
alena
f1b95641cb Refactor api deletePool, addHost, addSecondaryStorage 2010-08-18 15:41:16 -07:00
abhishek
6ca1ceb769 Refactoring the startvm cmd 2010-08-18 15:38:02 -07:00
abhishek
c58749b917 Refactoring StopSystemVmCmd 2010-08-18 14:55:19 -07:00
abhishek
716271fca1 Merge branch '2.1.refactor' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.1.refactor 2010-08-18 14:05:45 -07:00
abhishek
aa6e9ab2bb Refactoring the startvm command 2010-08-18 14:01:15 -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
alena
e2950eb5a1 Merge branch '2.1.refactor' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.1.refactor
Conflicts:
	server/src/com/cloud/api/BaseCmd.java
	server/src/com/cloud/network/security/NetworkGroupManagerImpl.java
2010-08-18 11:36:05 -07:00
Jessica Wang
275785404c Add Host - vlidate cluster section only if xenserver is xenserver 2010-08-18 11:30:01 -07:00
alena
3d85fdf687 API refactor 2010-08-18 11:24:29 -07:00
abhishek
8f54cac031 Resolve conflicts
Merge branch '2.1.refactor' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.1.refactor

Conflicts:
	server/src/com/cloud/api/BaseCmd.java
2010-08-18 10:41:34 -07:00
abhishek
e553bcde96 Refactoring the updateResourceLimits code, moving all logic to agent manager, updating the enum with a new manager type for reflection 2010-08-18 10:32:21 -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
Kris McQueen
261c96f99c refactor createPod command to new API framework 2010-08-17 19:08:06 -07:00
Kris McQueen
21ab91dc2c refactoring CreateNetworkGroup API command to new API framework 2010-08-17 19:07:00 -07:00
Kris McQueen
82d6edcdf3 Refactoring CreateIPForwardingRule and CreateLoadBalancerRule to new API framework 2010-08-17 19:07:00 -07:00
Kris McQueen
a6c34d422c Work in progress for modifying createPortForwardingRule command.
- some of the logic has been moved to manager
  - some annotations have been added for the command itself
2010-08-17 19:07:00 -07:00
abhishek
154c6985a4 Refactoring updatePod command 2010-08-17 17:55:38 -07:00
abhishek
1252a2b8a7 Refactoring update service offering cmd 2010-08-17 17:21:04 -07:00
abhishek
1174486e27 Refactoring into server project 2010-08-17 16:43:57 -07:00
abhishek
57edd7d2f8 Refactoring the StorageManager interface into server code 2010-08-17 16:43:01 -07:00
abhishek
8b8f126a2c Called the wrong method, fixing the same 2010-08-17 16:11:44 -07:00
abhishek
7e502768ed Incremental checkin 2010-08-17 16:07:48 -07:00
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
abhishek
492fa760ff Removing unused imports 2010-08-17 15:19:09 -07:00
abhishek
fffd1f2099 Refactoring permissions commands 2010-08-17 15:18:00 -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
abhishek
67b8a9e608 Incremental checkin 2010-08-17 14:52:29 -07:00
Jessica Wang
1849d4a6b1 Issue #: 5894
Create Template from Snapshot dialog - add password dropdown field
2010-08-17 14:25:54 -07:00
abhishek
4114c1b74a Adding the updatetemplateoriso command refactoring, 2010-08-17 14:14:16 -07:00
abhishek
c092b78c47 Changing the manager 2010-08-17 12:22:26 -07:00
abhishek
001fc0f7ae Refactoring update user command 2010-08-17 12:12:07 -07:00
abhishek
6f680375f3 Refactoring some more vm commands, as well as refactoring the account and user validation into a method. Please use the same for future validation calls 2010-08-17 11:28:23 -07:00
Chiradeep Vittal
b104bbb511 ignore override and bin and logfiles properly 2010-08-17 11:09:12 -07:00