anthony
4289dd79ec
Template size,
...
1. the size in template_pool_ref now is physical size.
2. template in storage pool is implemented as snapshot, fix x3 issue
3. fix x4 issue
2010-09-01 20:12:01 -07:00
abhishek
6cc9e740e4
organizing imports
2010-09-01 14:06:35 -07:00
abhishek
398e5774ae
Merging 6065 into master
2010-09-01 13:52:48 -07:00
edison
84fa801360
Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
2010-09-01 11:18:12 -07:00
edison
e92af8c72a
Fix the bug:
...
Remove host when the host is in disconnected state, then you will fail to add the same host back.
2010-09-01 11:17:06 -07:00
abhishek
9535dc8f4d
bug 6023: Implemented the search by group
...
status 6023: resolved fixed
2010-09-01 10:45:01 -07:00
Manuel Amador (Rudd-O)
b0acdbcf8b
Split out build responsibility into per-project wscript_build files. Installation of generic directories like bindir, and creation of systemvms, remain in toplevel wscript_build. Make some waf code useful and reusable in the form of tools.
2010-08-31 20:40:17 -07:00
edison
11fb89ac87
Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
2010-08-31 19:46:18 -07:00
edison
ea2828ee03
fix adding host bugs
2010-08-31 19:46:03 -07:00
anthony
c65175aa40
bug 6048: Check createvolume's return
...
status 6048: resolved fixed
2010-08-31 13:05:42 -07:00
abhishek
854611e40a
bug 5897: returning the os_type_id
...
status 5897: resolved fixed
2010-08-30 16:25:58 -07:00
abhishek
1c87879e21
bug 4898: removing the upgrade.url param
...
status 4898: resolved fixed
2010-08-30 14:49:22 -07:00
abhishek
992458e9d0
bug 5843: Merging in the fix
...
status 5843: resolved fixed
2010-08-30 13:45:22 -07:00
abhishek
64210bd16d
bug 6010: Fixing the list volumes issue, now we filter volumes based on the template type and not based on the names
...
status 6010: resolved fixed
2010-08-30 11:18:43 -07:00
abhishek
7a0ad69b89
Incremental checkin
2010-08-30 10:40:45 -07:00
Kelven Yang
7eb61b705a
Allow NetworkManagerImpl and SecondaryStorageImpl to tolerate missing of system vm template at startup
2010-08-27 16:32:03 -07:00
kishan
0e326e853c
bug 5900: Added events for disk offering
2010-08-27 18:02:23 +05:30
Anthony Xu
8a928a7a30
Merge branch 'master' of ssh://anthony@git.cloud.com/var/lib/git/cloudstack-oss
2010-08-26 16:06:57 -07:00
Anthony Xu
d72e0538da
Revert "Revert "use iso to patch systemvm""
...
This reverts commit 145e2e0aaa .
2010-08-26 16:06:28 -07:00
Anthony Xu
145e2e0aaa
Revert "use iso to patch systemvm"
...
This reverts commit 3565f8d21b .
2010-08-26 16:03:34 -07:00
root
3565f8d21b
use iso to patch systemvm
...
Conflicts:
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
scripts/vm/hypervisor/xenserver/xenserver56/patch
2010-08-26 15:56:02 -07:00
Kelven Yang
b69816814c
Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
2010-08-26 13:56:23 -07:00
kishan
43169f3f96
bug 5895: added config param to turn on/off md5 hash
2010-08-26 23:39:32 +05:30
kishan
fb99f95d7c
bug 5730: update dns of systemVms during zone update
2010-08-26 21:02:37 +05:30
kishan
acb23b6158
bug 5904,5474: added listCapabilities API
2010-08-26 14:53:03 +05:30
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
Kelven Yang
23a38bc2be
Debug & Test template copy from secondary storage to primary stroage on vmware
2010-08-25 18:17:20 -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