Commit Graph

291 Commits

Author SHA1 Message Date
frank
890bfffe2f Bug 6849 - Randomize systemvm passwords (edit)
status 6849: resolved fixed
2012-02-03 17:28:58 -08:00
Kelven Yang
8060918805 bug 13428: upgrade newly issued realhostip certificate. Reviewed by: Anthony 2012-02-02 11:49:20 -08:00
anthony
3615b15c39 bug 13338:
increate timeout for sshcheck to 10 minutes
if sshcheck fails, finalizeCommandsOnStart fails, no exception

status 13338: resolved fixed
2012-01-26 12:22:24 -08:00
Edison Su
9bcb2affff bug 12139: add a way to specifiy which hypervisor used to start system vm:
Admin can either configure system.vm.default.hypervisor which is a global configuration for all zones, or call updatezone add defaultSystemVMHypervisorType
status 12139: resolved fixed
2012-01-10 15:11:50 -08:00
Kelven Yang
85ad8ffca3 rename com.cloud.identity package to com.cloud.uuididentity as a previous deleted com.cloud.Identity name make git confused with com.cloud.identity under linux systems 2012-01-05 14:52:16 -08:00
kishan
a2ed3fa5e2 bug 12337: encrypt Hidden category config values only
reviewed-by: Abhi
2011-12-20 15:07:22 +05:30
Alena Prokharchyk
bb2a8cf7ea NaaS: added "subdomainAccess" parameter to domain level network object. The parameter defines whether the network can be accessed from the subdomains. If the parameter is not specified, it would be defaulted to allow.subdomain.network.access Global Config param 2011-11-14 18:13:47 -08:00
Alena Prokharchyk
87f5150e38 Basic zone is fixed and works with new NaaS now 2011-11-14 10:46:05 -08:00
Alena Prokharchyk
039e09ce93 * Introduced aclType parameter for createNetwork command (can hold 2 values now: Account and Domain). This parameter defines the access control type to the network object. If it's account -
only owner of the network can access it; if it's domain - all accounts in the domain and domain children can have an access.
* aclType replaces 2 old fields: isShared and isDomainSpecific.
* All 2.2.x account specific networks will have aclType=Account; 2.2.x Domain specific networks - aclType=domain; 2.2.x Zone level networks - aclType=Domain with domainId = Root domain id
2011-11-10 18:34:56 -08:00
Alex Huang
f6fcaa49ec Merge complete except for virtualnetworkappliancemanager 2011-11-10 15:18:16 -08:00
Kelven Yang
d9c41df1a1 Make console proxy support UUID 2011-11-03 16:24:08 -07:00
alena
3e20c60d6d Fixed vm deployment in Basic zone 2011-11-02 17:02:44 -07:00
alena
f42c9e434f Basic zone: the System Guest network offering can be created from any Shared Guest network offering.
Limitation:
* in order to make the networkOffering choice, only one Shared network has to be Enabled at the moment when Basic zone is being created
2011-11-02 15:44:53 -07:00
alena
80dc2c0b1a Don't send security group commands to the backend when 1) securtiy group service is disabled in the network offering and 2) security group service provider is supported on the physical network 2011-11-01 12:07:32 -07:00
alena
ceda05298e Deprecate guestIpType in networkOffering api. Use type (Shared/Isolated) instead 2011-10-19 16:38:39 -07:00
alena
c00058adc2 Added type (Shared/Isolated) to the networkOffering/networks 2011-10-13 17:33:41 -07:00
frank
0f5384d086 Bug 11522 - New agent manager
move findxxx interface from HostDao to Managers
2011-10-06 11:56:17 -07:00
frank
e5fca855c1 Bug 11522 - New agent manager
register/unregister resource state adapter in configure/stop of implementations
2011-09-27 11:51:03 -07:00
frank
e0e5491c42 Bug 11522 - New agent manager
implements ResourceStateAdapter in a couple of components
2011-09-23 11:28:02 -07:00
Kelven Yang
f70958809b bug 11360: make user_vm_details generic to all VMs instead of user-only VMs, VM details info will be carried down to hypervisor resource 2011-09-07 15:42:40 -07:00
anthony
455f9f642c bug 11014:
1. if there is no storage pool, don't try to start system VM
2. not use "consoleproxy.restart" as other meaning

status 11014: resolved fixed
2011-08-08 18:31:14 -07:00
Kelven Yang
0fa8b65cde bug 10656: check OutOfMemoryError in critical path, fix run.sh to let it be able to monitor process termination 2011-07-11 16:33:19 -07:00
Kelven Yang
efa431ed1b Add data integrity check for Console Proxy/SSVM/Domain Router 2011-07-06 17:31:39 -07:00
Abhinandan Prateek
79e38f0a1f bug 10305: for a systemvm only applicable system vm offering should be displayed
status 10305: resolved fixed
While creating a system vm offering specify the type. If no type specified the default to domainrouter.
While requesting a set of system offering specify the paramter systemvmtype.
2011-06-20 20:11:50 +05:30
Abhinandan Prateek
db29a56eaf bug 10313: marking default system offering as default so that they should not be deleted
status 10313: resolved fixed
2011-06-19 12:16:06 +05:30
Alex Huang
d9e0bcfa1e bug 10126: Renamed getPodId() to getPodIdToDeployIn() 2011-06-03 22:17:08 -07:00
anthony
37e6ded80c bug 10023: only set ip route for internal DNS
status 10023: resolved fixed
2011-05-25 17:39:20 -07:00
Kelven Yang
346ee18f6a fix a regression in ConsoleProxyManagerImpl.java 2011-05-06 15:44:45 -07:00
Kelven Yang
7c2bcefe71 bug 9371: serve client request only with running proxy VMs, serialize proxy VM launch 2011-05-05 14:59:20 -07:00
Chiradeep Vittal
87867c8f39 for mycloud: if no system vm required do not start it 2011-05-03 11:40:44 -07:00
Chiradeep Vittal
b42ebf4872 Build fixes after first pass at merge 2011-05-03 10:41:31 -07:00
Chiradeep Vittal
303e2a7481 Start of zonesfeature / mycloud/cloudkit 2011-05-03 10:40:17 -07:00
Alex Huang
6ce656220f bug 9643: propagate fix from 2.2.4 2011-04-29 17:51:42 -07:00
alena
671ec62358 bug 9623: set ha_enable to false for consoleProxy vms and service_offering.
status 9623: resolved fixed

Also set ram_size to 1024 for console proxy offering during the upgrade

Conflicts:

	core/src/com/cloud/vm/SecondaryStorageVmVO.java
	server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/storage/allocator/LocalStoragePoolAllocator.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
2011-04-29 11:53:07 -07:00
Alex Huang
99bc15f64a changed getName to getHostname 2011-04-29 08:34:10 -07:00
Kelven Yang
9b86ef7942 bug 9022: turn off HA for SSVM and Console Proxy VM 2011-04-28 18:03:11 -07:00
alena
6352851e43 More logging to consoleProxy start command 2011-04-28 01:19:42 -07:00
Kelven Yang
e69774e13a Add console proxy management state, support certificate upload, all done except UI 2011-04-21 18:46:37 -07:00
alena
22ee7117f5 bug 9521: fixed NPE in finalizeCommandsOnStart() method by adding vm's nic to vm profile during the vm to vmProfile conversion.
status 9521: resolved fixed
Conflicts:

	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
2011-04-20 16:16:01 -07:00
Kelven Yang
7103e1c9a7 global replacement to avoid using getClass().getName() for unique names 2011-04-19 17:26:41 -07:00
Chiradeep Vittal
b56c82e3b6 bug 9330: ensure that console proxies are always created from the same hypervisor type 2011-04-12 15:24:59 -07:00
Alex Huang
075fba5899 stackmaid is now taskmanager 2011-04-05 10:17:22 -07:00
alena
bf588166ed bug 7704: network limits cleanup.
status 7704: resolved fixed

For user vm:
* for default network, take limit from the corresponding service offering
* for all additional networks, take limit from the network offerings

For domainRouter/SSVM/CPVM:
* get info from the network offering

Added new config parameter: "vm.network.throttling.rate". If nw_rate is NULL for serviceOffering, this parameter would be used for default vm's network
2011-04-01 15:48:32 -07:00
Kelven Yang
ea95ac1808 bug 8713 : finalize the implementation of supporting system vm pooling 2011-03-31 17:14:09 -07:00
Kelven Yang
2e24a68f7f bug 8713: use SystemVmLoadScanner for SSVM 2011-03-29 15:10:34 -07:00
Kelven Yang
8e727230ce Use SystemVmLoadScanner for console proxy VMs 2011-03-29 11:19:01 -07:00
Kelven Yang
458998c609 bug 8960: add management.netaddr.cidr to CPVM and SSVM 2011-03-14 11:24:25 -07:00
Edison Su
b20808d223 minor fix 2011-02-28 12:16:40 -05:00
Edison Su
8a40371288 refactor security group in advanced network mode: use direct tagged network instead of public network 2011-02-24 19:58:18 -05:00
alena
57f6b16cdb bug 8719: fixed NPE happening during HA process - get control nic infrormation in finalizeCommandsOnStart() method instead of setting it in caller methods
status 8719: resolved fixed
2011-02-23 19:35:22 -08:00
alena
15f59e6f58 bug 8637: throw ResourceAllocationException when resource limit is exceeded.
status 8637: resolved fixed
2011-02-18 12:26:58 -08:00
Alex Huang
7dd54f079b started vms with these latest 2011-02-11 17:03:04 -08:00
Kelven Yang
091b5850b3 Explicitly specify CPU speed for all system VMs, speed of 0 no longer works for VMware 2011-02-09 15:08:06 -08:00
alena
e9dd1ee822 bug 8383: HA: perform ssh check before marking system vms as running. For domR, also reapply all ips/PF/LB/VPN/Dhcp/Userdata.
status 8383: resolved fixed
2011-02-04 14:33:14 -08:00
abhishek
1f8c4864d6 bug 8171: adding checks to ensure we do not start cp for any vm start unless we are out of maintenance
status 8171: resolved fixed
2011-02-04 14:00:37 -08:00
Alex Huang
e153ab461c removed unused method 2011-02-04 11:56:21 -08:00
Alex Huang
0105c03a27 initial HA work 2011-02-04 11:51:14 -08:00
Edison Su
5b073cd370 bug 8087: default hypervisor type is gone: when creating cpvm/ssvm, randomly choose one hypervisor type, which got from host table. When creating domR, as we already know the hypervisor type at that time, so domR and user vm are always created as the same hypervisor type.
status 8087: resolved fixed
2011-02-01 11:32:40 -05:00
alena
52dd679d95 bug 8185: fixed java part of password reset feature. There are still changes needed in backend scripts (bugs 8253 and 8254 are filed separately)
status 8185: resolved fixed
2011-01-27 17:24:09 -08:00
Kelven Yang
e7c8872651 Use URL safe BASE64 encoding for console access ticket generation. 2011-01-27 11:54:41 -08:00
Kelven Yang
3b846961ce Bug 8229: Add finalizeExpunge to VirtualMachineGuru interface to allow overriding cleanup operations at expunging stage
Status 8229: Resolved Fixed
2011-01-27 10:29:55 -08:00
Kelven Yang
34178bec61 1) add destroySystemVm command to allow destroying of system VMs
2) add consoleproxy.launch.max to allow specifying a configured max number of console proxy VM that can be launched within a zone(if not specified, default is 10), this is to prevent possible DoS attacks or uncontrolled usage of system resources
3) Remove some unused code.
2011-01-26 12:08:35 -08:00
Kelven Yang
a56e5ace88 Bug 8102: CheckSshAnswer could be null 2011-01-25 16:42:05 -08:00
Kelven Yang
2b646f3ee0 1) Refactor ConsoleProxyManager to new networking and VirtualMachineManager interface
2) Don't destroy/re-create console proxy because of starting failure to take advantage of storage recreation in 2.2
3) Remove the race-condition in starting new instance of console proxy to avoid multiple ones being started for standby capacity reservation
4) Add a global configuration variable - system.vm.auto.reserve.capacity, set it to false to prevent automatical console proxy launching, the change of the variable value can take effect without the need of restarting management server
2011-01-25 16:04:02 -08:00
Kelven Yang
8f138d9330 Remove unused code in ConsoleProxyManager 2011-01-25 11:36:07 -08:00
Alex Huang
65034995a3 removed unused guest ip fields from system vm 2011-01-24 17:50:32 -08:00
Alex Huang
fc33ef2be2 Removed several unused fields after the refactoring 2011-01-24 16:18:40 -08:00
kishan
94ec7bf27a bug 7842: events refactoring. Still wrok in progress 2011-01-20 21:49:50 +05:30
Alex Huang
650fb5221e nic is no longer reserved 2011-01-18 19:28:44 -08:00
Alex Huang
e8f89004d9 added more robust start code 2011-01-18 16:09:24 -08:00
alena
50540b2bba Stop ConsoleProxy/SecondaryStorage vms: use the same code path as for user vms. 2011-01-14 17:57:15 -08:00
Alex Huang
d43717eef8 merge changes 2011-01-14 15:12:13 -08:00
Alex Huang
19edfdfcdb migration code 2011-01-14 15:12:13 -08:00
Kelven Yang
d14f3bffc3 Log for console ticket verification 2011-01-13 14:58:48 -08:00
Alex Huang
6d9442be54 Finished all merges and unit testing 2011-01-11 18:02:09 -08:00
Alex Huang
6e6e8ff876 better expunge and destroy of volumes 2011-01-11 18:02:09 -08:00
Alex Huang
ad4ed5b2fd added hypervisor type to vm 2011-01-11 18:02:09 -08:00
alena
5dfe399c1a bug 7803: introduces new parameter "is_default" for the network. DeployVm requires 1 default network to be specified, other networks (if any) have to be secondary
status 7803: resolved fixed

Fix overview:

1) Parameter "isDefault" should be defined as a part of createNetwork
* Virtual network is always default
* Parameter can be specified only for DirectNetwork
* Once parameter is set, there is no way to change it as we don't provide updateNetwork command.
2) Added isDefault parameter to listNetworks command so you can sort by that.
3) DeployVmCmd:
* at least one default network should be set
* if more than 1 default network is set - throw an error
4) Return isDefault information as a part of Nic object for the vm response in deploy/stop/start/listVm
2011-01-11 14:22:26 -08:00
alena
d0687f663f bug 7863: fixed router cleanup thread
status 7863: resolved fixed

Router cleanp thread is fixed, here is functionality description:

* Runs every "router.cleanup.interval" period of time (1 day by default)
* Stops only domRs running in Advance zone
* Thread Flow:
- gets all Running domRs/dhcps, get their networks, select network that
has to be checked (see criteria below):
- checks that there is only one nic in the op_networks table for the
network, and this nic belongs to domR/dhcp
- Stops domR/dhcp
* Criteria to choose the network:
- Network has to be non-system.
- Network should be one of the following: Guest Virtual (TrafficType=Guest; GuestType=Virtual); Direct Tagged (TrafficType=Public; GuestType=Direct)

Couple of other fixes:

* Added isShared parameter to listNetworks command
* Moved guestType from NetworkOffering to Network
2011-01-07 16:57:47 -08:00
anthony
1044a99756 check answer 2011-01-07 13:54:58 -08:00
alena
916b516d13 bug 7878: Fixed Basic zone functionality - uservm/systemvm/domR start
status 7878: resolved fixed
2011-01-06 15:44:13 -08:00
Kelven Yang
496bbeba88 Bug 7860: protected from NPE whhile console proxy public address is not set during startup process 2011-01-04 22:31:44 -08:00
Alex Huang
4eba6d10d7 Moved State into VirtualMachine like other States of objects 2011-01-04 15:01:34 -08:00
alena
0b7a15ab99 bug 7348: reapply PortForwardingRules (including 1-1 Nat), LB rules, Vpn as a part of domr Stop/Start
status 7348: resolved fixed

More fixes:
* Update user_statistics on each domR stop/reboot
* Reset dhcpData/userData as a part of domR stop/reboot
* More logging for domR commands
2011-01-03 23:00:05 -08:00
Alex Huang
da4ed648ac consolidated all of the vm destroy, cleanup and account cleanup. 2010-12-30 05:46:54 -08:00
Kelven Yang
271b1ee58a add consoleproxy.disable.rpfilter configuration variable to get rid of the annoying access issue in development environment.
set it to true for development environment, it will allows traffic that comes in from public interface to be able to be routed back from private interface
2010-12-28 17:15:00 -08:00
edison
3a143577b9 bug 7659: fix the race condition that agent inside systemvm connecting to mgt server at the head of startcommand returning to mgt server, then got a NPE. and fix bugs in security group of KVM
status 7659: resolved fixed
2010-12-28 15:51:28 -08:00
kishan
53d3455cbe bug 7504: Events refactoring 2010-12-24 12:58:32 +05:30
kishan
bb0e6a0ae3 bug 7504: Events refactoring 2010-12-24 12:58:32 +05:30
abhishek
bb5859de83 bug 7615: enabling the system vms and domr to be ha-enabled by default
status 7615: resolved fixed
2010-12-21 17:44:32 -08:00
Alex Huang
356526db83 Changed exception code to give the scope of the problem 2010-12-21 03:54:30 -08:00
Alex Huang
65d0b32182 removed a bunch of old code 2010-12-16 14:04:32 -08:00
abhishek
5e61be67fd fix bugs in allocator 2010-12-13 16:42:25 -08:00
alena
d077b127aa bug 7498: fixed search by keyword in listUserVm/listSystemVms/listRouters commands
status 7498: resolved fixed
2010-12-13 15:22:11 -08:00
Alex Huang
790bf40be6 Forgot what i change but must be important 2010-12-10 17:20:31 -08:00
Kelven Yang
68e6706fbe Fix a number of issues related with vmware on new networking 2010-12-09 19:33:30 -08:00
edison
712953156b fix boot from iso/attach iso/disks issue 2010-12-09 14:25:44 -08:00
Alex Huang
e49fab6903 Renamed MauricMoss now that we're going public with this. 2010-12-08 09:28:01 -08:00
Alex Huang
2c42ebbf71 ip assoc working 2010-12-08 09:03:34 -08:00
edison
20b677be10 add public/private/guest network in each type of vm 2010-12-06 18:36:46 -08:00
Alex Huang
f147bf5f94 start vm not working again 2010-12-06 14:17:53 -08:00
Alex Huang
fcdd20ca06 more checkin 2010-12-06 14:17:53 -08:00
edison
7db0e79692 fix NPE when starting system vm 2010-12-06 14:03:56 -08:00
Alex Huang
daa9add158 removed router stuff from network manager 2010-12-04 17:32:31 -08:00
edison
e591f56b25 add logs, and don't break old code 2010-12-04 15:02:03 -08:00
edison
d17beeb348 move all the vm's state machine to itmgr->statetransitTO 2010-12-04 15:02:02 -08:00
edison
2e3ef1408c refactor 2010-12-04 14:59:40 -08:00
alena
150d684e05 1) isShared attribute belongs to Network now, not NetworkOffering
2) Added list by networkId support to listVirtualMachines command.
3) Implemented search by zoneId in listNetworks command
2010-12-03 19:07:08 -08:00
alena
f8a687ab23 1) Implemented create/list/deleteNetworkOffering create/delete/listNetwork APIs.
2) Added networkIds parameter to deployVMCmd - accepts list of networks ids separated by coma.
3) Changed domainRouter/systemVm/userVm response to return list of Nics associated with the vm.
2010-12-02 19:30:17 -08:00
Kelven Yang
fd1beef28b Someone commited a change in ConsoleProxyManagerImpl that breaks down system VM, let's blame git for now on this 2010-11-24 15:17:07 -08:00
alena
aa8aa6027a Modified UserContext - got rid of accountName, domainId fields as we can get this information from Account field. 2010-11-24 14:29:08 -08:00
Alex Huang
1e44925564 api refactoring 2010-11-21 12:00:21 -08:00
Alex Huang
5b4a6f27db Changed networkconfigurations to network as per Sheng's suggestion 2010-11-19 15:44:42 -08:00
Alex Huang
a73e3dc9ac new networking can be set by use.new.networking 2010-11-17 17:51:17 -08:00
Alex Huang
ed31497188 ComponentLocator changes 2010-11-16 04:28:15 -08:00
Alex Huang
17afeade00 better componentslocator 2010-11-16 04:28:14 -08:00
Kelven Yang
0653d6d7f6 Improve console access security with random generated hash key 2010-11-12 16:59:58 -08:00
anthony
2537dc3058 bug 7149: merge from 2.1.x 2010-11-12 13:16:03 -08:00
Alex Huang
16b6850bea revert console proxy 2010-11-08 12:29:38 -08:00
Alex Huang
aca8ef79cd a bunch of other changes for network refactoring 2010-11-08 12:29:37 -08:00
Alex Huang
2be0cd6a95 stop worked again 2010-11-08 12:29:36 -08:00
Alex Huang
4555fcd73f changed everything back so everyone can test 2010-11-05 16:10:22 -07:00
Alex Huang
4ccf4361d1 Finally domr and instance running again. 2010-11-05 16:10:22 -07:00
Alex Huang
5f90a8adb0 Checking in to do git pull...stupid git 2010-11-05 16:10:22 -07:00
Alex Huang
1fe446002b stop vm is now formalized 2010-11-05 16:10:22 -07:00
Alex Huang
0fdca8be9a changed back so everyone else can start the old way 2010-11-03 21:18:31 -07:00
Alex Huang
e27bb550fe Harmony among gurus 2010-11-03 21:18:31 -07:00
abhishek
3bab616478 After discussing with Alex, it was agreed that there is no need to mgmt server level locking using the mgmt_server_id. This makes the code easier, as we have one parent acquire and release mechanism, and the complexity is reduced. In accordance, we do not need to maintain cleanup tasks for mgmt server crashes, as the async mechanism deals with this. Also, the schema becomes a tad simpler as the mgmt_server_id column is not needed anymore 2010-11-01 17:04:28 -07:00
Alex Huang
4db0b7d156 Better integration between it and virtual machine gurus 2010-11-01 15:01:28 -07:00
abhishek
c74fd77730 putting in final comments, so that the code to be checked in is better readable for others trying to understand it 2010-11-01 09:06:32 -07:00
abhishek
fbe2d288d7 adding some code comments 2010-11-01 09:06:32 -07:00
abhishek
b9cd3e2522 some more fine tuning around corner cases 2010-11-01 09:06:32 -07:00
abhishek
362e67d724 adding failover protection case for when the mgmt svr crashes in the middle of executing something; along with custom response for cert 2010-11-01 09:04:51 -07:00
abhishek
7b87aad660 fixed a bug in the listener flow; now handling the application of certs to existing cpvms and new cpvms based on a fork in the logic in the console proxy resource 2010-11-01 09:04:51 -07:00
root
3752a4eb31 making the logic more robust, testing more corner cases, improving efficiency and changing the schema 2010-11-01 09:04:51 -07:00
Alex Huang
96a4aa6f2b checkin to allow regular code path 2010-10-29 12:16:58 -07:00
Alex Huang
14f80f2e13 domain router up and running...now on to patching through the network between the domain router and the vm 2010-10-29 12:16:58 -07:00
Alex Huang
4f9f249218 make console proxy work again with the new network configuration 2010-10-26 17:37:29 -07:00
abhishek
a698c0327d adding more logging around successful cert upload 2010-10-26 14:27:26 -07:00
abhishek
c6588c0e25 adding some error return handling to api dispatcher, and cleaning up some of the code paths to return the right error messages 2010-10-26 14:27:26 -07:00
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
Alex Huang
f58063911e deploy vm completed 2010-10-26 09:35:24 -07:00
Alex Huang
d5d8f27cad Added more changes to the api 2010-10-21 15:11:49 -07:00
Alex Huang
2da8035bd1 more changes for the rewrite 2010-10-19 11:52:02 -07:00
Alex Huang
794ca16a65 Added code to start domR 2010-10-19 11:52:01 -07:00
Kelven Yang
915d29f47b Skip starting of console proxy when storage pool is not ready 2010-10-15 18:57:28 -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
Alex Huang
ce091de3d2 more changes for refactor 2010-10-12 07:17:47 -07:00