Commit Graph

11 Commits

Author SHA1 Message Date
root 42f1ff92a9 resolved merge conflicts after git pull --rebase 2010-10-26 14:27:26 -07:00
abhishek f64abad8f5 completed the listener logic. Based on the startup command, we will try and update a cust cert to a new running cpvm, and fail if such a cert doesn't exist in the cert table in our db. 2010-10-26 14:27:26 -07:00
Kris McQueen 8e086d7a21 resolving merge conflicts between 2.1.refactor and master 2010-10-12 16:28:16 -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
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
abhishek 72243c8382 bug 5191: incremental checkin 2010-09-27 11:10:55 -07:00
Kris McQueen d7b6ccd056 Comment out code in executors during the transition to the new API framework. The code is being left around for reference during testing/debugging of the new framework and will be removed in the future. 2010-09-17 11:13:29 -07:00
Kris McQueen df10af0688 cleaning up imports, fixing up some compilation problems related to API refactoring 2010-09-13 15:25:46 -07:00
Alex Huang 417a3c8c18 bug 5764: More changes 2010-08-19 11:27:30 -07:00
alena 3d85fdf687 API refactor 2010-08-18 11:24:29 -07:00
Manuel Amador (Rudd-O) 05c020e1f6 Source code committed 2010-08-11 09:13:29 -07:00