38116 Commits

Author SHA1 Message Date
abhishek
67e1eee981 Adding to migration script 2010-08-23 16:27:40 -07:00
abhishek
7f771cbe24 bug 5883: Final checkin for volume lineage
status 5853: RESOLVED FIXED
2010-08-23 16:17:18 -07:00
abhishek
87f8c3449f Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2010-08-23 16:04:16 -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
Manuel Amador (Rudd-O)
a9a22c7c81 fedora 12 is the test for dependency of cloud-qemu 2010-08-23 15:02:24 -07:00
Kelven Yang
7a46156d09 Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2010-08-23 14:17:18 -07:00
Kelven Yang
8eb1e27b3c Update eclipse project classpath file to work with renamed vmware jar files 2010-08-23 14:16:43 -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
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
abhishek
ec9fdd5b16 Refactored disassociateipaddress cmd 2010-08-20 16:01:37 -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
abhishek
5503013e1f Refactoring the lockAccount cmd 2010-08-20 14:48:35 -07:00
abhishek
799984659a Merge branch '2.1.refactor' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.1.refactor 2010-08-20 14:21:28 -07:00
abhishek
58598bb0cb Refactoring the lockUser cmd 2010-08-20 14:20:27 -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)
bcb9fabe75 Add thirdparty jars because otherwise the premium parts that do VMWare do not compile 2010-08-20 13:11:05 -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
abhishek
934173db2e Refactoring some more system vm commands 2010-08-20 12:19:37 -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
abhishek
dc45e9b08b Refactoring the rebootvm cmd 2010-08-20 11:48:24 -07:00
abhishek
be75946b1f Refactored the reconnectHost command 2010-08-20 11:14:48 -07:00
abhishek
49482e947b Refactoring another bunch of commands for vms 2010-08-20 10:38:44 -07:00
abhishek
b27a5af5fc Refactored 2010-08-20 10:15:58 -07:00
abhishek
62df1ce6a9 Refactored 2010-08-20 10:15:35 -07:00
abhishek
f625900b8b Refactoring the register command 2010-08-20 09:59:06 -07:00
abhishek
728b4641f6 Further refactoring of the templates and iso code. 2010-08-19 18:07:07 -07:00
abhishek
d5b041a790 Refactoring register commands for template and iso 2010-08-19 17:59:56 -07:00
abhishek
d468a0bd7f Incremental checkin 2010-08-19 16:40:41 -07:00
abhishek
21f7c0dec8 Refactored RegisterTemplateCmd 2010-08-19 16:33:26 -07:00
abhishek
fcdeb5a97d Incremental checkin 2010-08-19 14:40:08 -07:00
abhishek
9da6d89837 Refactoring deleteServiceOffering cmd 2010-08-19 12:15:26 -07:00
abhishek
24db6ae24e Merge branch '2.1.refactor' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.1.refactor 2010-08-19 12:00:53 -07:00
abhishek
c200375b0f Refactoring RemoveFromLoadBalancerRuleCmd 2010-08-19 11:59:56 -07:00