1484 Commits

Author SHA1 Message Date
Alex Huang
2bc938c3f8 checkins for problems. 2010-10-26 09:35:24 -07:00
Alex Huang
f58063911e deploy vm completed 2010-10-26 09:35:24 -07:00
Kris McQueen
7e72045ecd Merging the fix to bug 6680 to master branch by hand due to differences in the code between 2.1.x and master. The fix is for join conditions in GenericDaoBase, making sure to only add non-null / non-empty where clauses to the query string, and to recursively prepare all join parameters since there might be sub-join clauses in the query. 2010-10-25 15:01:49 -07:00
Alex Huang
d5d8f27cad Added more changes to the api 2010-10-21 15:11:49 -07:00
Kelven Yang
2c919c5c01 Make unique name conforming with the name generated in template installation for routing template, some other minor fixes 2010-10-15 16:36:02 -07:00
Kris McQueen
2740ba6c40 final merge of master->2.1.refactor preparing for merge back into master 2010-10-12 14:46:24 -07:00
Kelven Yang
e12f9ad19d Allow Script to execute under a specified working directory 2010-09-29 18:40:50 -07:00
Kelven Yang
4534299092 Improve SynchronizationEvent 2010-09-29 18:40:49 -07:00
Kris McQueen
848ce60097 Merging master into 2.1.refactor, resolve the merge conflicts as best I can. New commands related to extracting template/iso/volume and related to instance groups were refactored to the new API framework. 2010-09-28 15:47:14 -07:00
alena
9b10074c2a Added missing license info to the bunch of files 2010-09-27 19:08:03 -07:00
Alex Huang
c443867f28 more changes 2010-09-27 15:14:38 -07:00
alena
0f2f356874 bug 6277: listVirtualMachines with group=-1 would return all vms that don't belong to any group. As a part of the fix, changed Dao layer to be able to make different types of Joins - Inner, Right, Left, etc.
status 6277: resolved fixed
2010-09-23 10:43:17 -07:00
Alex Huang
c0d8422d69 more changes 2010-09-22 10:43:59 -07:00
Alex Huang
22652e7ace got the vm created 2010-09-22 10:43:59 -07:00
Alex Huang
8acba8fbd1 more checkins 2010-09-22 10:43:59 -07:00
alena
0c659af24a Implemented DB migration from 2.1.x to 2.2.x for Instance Grous feature. Added missing Daos to migration-components.xml (AccountDao, ResourceCoundDao, InstanceGroupDao, InstanceGroupVmMapDao).1 2010-09-21 18:53:18 -07:00
Alex Huang
bebe79ebc9 more work from alex 2010-09-17 13:37:53 -07:00
Kris McQueen
3f6a438d92 Refactoring the AsyncJobManager to queue jobs appropriately if there is a need to synchronize execution on an object, e.g. a router. API developers can now call command.synchronizeCommand(String, Long) to force the command to be synchronized on a particular object type [the string arg] with a particular id [the long arg]. When synchronizeCommand() is invoked, an exception maybe thrown by the framework (AsyncCommandQueued exception) to force the business logic to abort. The command will then be queued and invoked at the appropriate time. The synchronizeCommand() is re-entrant and will be a no-op if the command has already been queued and is now ready for execution. 2010-09-16 19:05:06 -07:00
Alex Huang
327924a9ad More changes for refactoring 2010-09-15 18:00:54 -07:00
Kris McQueen
a8112f65de When using session based authentication, we now store the parameters in the session as part of the login processing, instead of returning those parameters so that the caller has to update the session. Authentication now throws an exception on failure and the caught exception is where the session is invalidated. 2010-09-13 17:04:11 -07:00
root
76e5cf3321 renamed dao methods to correctly reflect what they do 2010-09-09 18:01:50 -07:00
Alex Huang
d094ff3afb more changes from merge 2010-09-09 13:29:24 -07:00
jessica
6ec5455579 If no translation is found, return original word (i.e. English word) 2010-08-31 14:58:33 -07:00
jessica
f04e1351bc add CloudResourceBundle.java to com.cloud.utils 2010-08-31 14:58:31 -07:00
Kelven Yang
b91c910a94 Test & Debug register template on vmware 2010-08-26 13:35:46 -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
Alex Huang
20b26082db bug 5764: changing from networkoffering to network profile 2010-08-24 00:00:43 -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
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
Manuel Amador (Rudd-O)
07addfed62 If git build sccs file is present, catenate it to standard output with these brand new commands 2010-08-11 18:14:55 -07:00
Manuel Amador (Rudd-O)
14ae76781e Committing Kris' big merge 2010-08-11 16:02:57 -07:00
Manuel Amador (Rudd-O)
ac730ec496 Branch 2.1.refactor committed 2010-08-11 09:13:42 -07:00
Manuel Amador (Rudd-O)
05c020e1f6 Source code committed 2010-08-11 09:13:29 -07:00