etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
38,393 Commits 325 Branches 325 Tags 885 MiB
Commit Graph

972 Commits

Author SHA1 Message Date
Frank e872996084 Bug 8208 - bare metal provisioning 
get DHCP entry state from DHCP server
 2011-03-11 14:09:23 -08:00
Frank 4324efea26 Bug 8208 - bare metal provisioning 
able to get IP from external DHCP server
 2011-03-11 14:09:23 -08:00
anthony bdcffa2b0d bug 8061: add forcely shutdown 2011-03-09 16:30:11 -08:00
Edison Su c4ac92af3f fix destroy snapshot 2011-03-09 10:20:05 -05:00
Frank 469280866d Bug 8208 - bare metal provisioning 
able to add external DHCP server
 2011-03-08 17:29:33 -08:00
anthony 5b1a421e62 bug 8712: prepare from snapshot db migration 2011-03-08 17:10:27 -08:00
Frank 6c819c1491 Merge branch 'bareMetal' 
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/commands/DeployVMCmd.java
	api/src/com/cloud/offering/ServiceOffering.java
	api/src/com/cloud/vm/UserVmService.java
	client/tomcatconf/components.xml.in
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/service/ServiceOfferingVO.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
 2011-03-08 14:18:11 -08:00
anthony 0c2a639a2d bug 6772: use vhd-util to coalesce snapshots into primary storage 
status 6772: resolved fixed
 2011-03-07 19:47:29 -08:00
anthony b8e03aca4c script fix 2011-03-07 19:47:29 -08:00
anthony a9c36d7b79 use new vhd-util for xenserver 2011-03-07 19:47:29 -08:00
anthony e01ca05208 copy_vhd_from_secondarystorage implement coalesce 2011-03-07 19:47:29 -08:00
Edison Su 9ad5139fda fix delete security group rule 2011-03-03 13:44:48 -05:00
anthony 5cc7745d9f never set lvm volume unavailable, there may be a conflict with XenServer GC 2011-03-02 19:23:21 -08:00
Edison Su c80335c9df bug 8783: user vm fs is crashed, use O_DIRECT instead of O_DSYNC/O_SYNC in qemu, aka cache=none. Hope we can reduce the possibility of guest vm crashed. 
status 8783: resolved fixed
 2011-03-01 16:38:23 -05:00
Edison Su d7b7d6bc26 bug 8771: multitenancy on same host in security group 
status 8711: resolved fixed
 2011-03-01 16:38:06 -05:00
Chiradeep Vittal 697b4f60db bug 8380: use instance name status 8380: resolved fixed 2011-03-01 14:07:30 -08:00
Frank 35b7c26689 Bug 8208 - bare metal provisioning 
able to start, stop, reboot, destroy VM
 2011-03-01 11:40:40 -08:00
Edison Su a7c6b9f28e fix security group rules 2011-02-28 12:16:40 -05:00
Edison Su 0e90ede56a don't break basic zone mode 2011-02-28 12:16:40 -05:00
Edison Su 2705adb3b1 security group is per bridge 2011-02-28 12:16:40 -05:00
Frank cd676f481d Bug 8208 - bare metal provisioning 
Successfully add start entry into LinMin PXE server
 2011-02-25 21:08:13 -08:00
Edison Su adbd20ca5a bug 8655: add security group for direct tagged network 2011-02-23 15:53:14 -05:00
Edison Su 0c8b86fc56 add multiple nics support for security group 2011-02-23 15:52:04 -05:00
Edison Su 37cb0ae2c9 add security group for direct tagged vlan 2011-02-23 15:52:04 -05:00
Frank b313b7c852 Add bare metal stuff to addHost command 
add ipmi.py
 2011-02-22 19:07:07 -08:00
Frank 77fadf5c7f Revert 61a414fb8f 
don't dynamically inject premium stuff
 2011-02-22 14:39:02 -08:00
Frank 61a414fb8f Inject permium stuff into systemvm.iso when managment server start 2011-02-20 16:13:30 -08:00
anthony 17f5d55459 fix typo 2011-02-18 13:07:57 -08:00
Chiradeep Vittal 10dc1c75d8 bug 8370: pass in original params when calling delete during add 
status 8370: resolved fixed
 2011-02-08 16:41:27 -08:00
Chiradeep Vittal 711c4eeaae bug 8209,8370,8459: cleanup scripting 2011-02-08 12:10:07 -08:00
anthony 54802c6d49 typo fix 2011-02-07 15:01:30 -08:00
anthony 7a8fcdb611 support lvmohba on copy_from/to_secondary 2011-02-07 14:44:34 -08:00
Kevin Kluge ee3bb01a11 cloud stack to CloudStack 2011-02-05 22:30:06 -08:00
Chiradeep Vittal 4f1342a4dd bug 8380: default chains weren't getting deleted 2011-02-04 12:04:53 -08:00
anthony c26833fb8a remove systemvm-premium.iso 2011-02-03 15:33:19 -08:00
Chiradeep Vittal 58e92bbe84 bug 8347: skip ebtables if kernel doesn't support it 2011-02-03 11:57:31 -08:00
Chiradeep Vittal ca057a43dd bug 8347: skip ebtables if kernel doesn't support it 2011-02-03 11:53:25 -08:00
anthony 294e41392e Console proxy is back 2011-02-03 10:57:19 -08:00
anthony b9e32cceb9 script may return stdout from command, need to add another # to seperate it 2011-02-02 16:29:11 -08:00
anthony 36778f4e3c bug 8291: get physical vdi size before dd 
status 8291: resolved fixed
 2011-02-02 14:13:59 -08:00
Chiradeep Vittal 6b8024ffaa bug 8302: dont hardcode ebtables path 
status 8302: resolved fixed
 2011-02-02 12:56:46 -08:00
Chiradeep Vittal 0be687dc09 bug 8302: dont hardcode ebtables path 
status 8302: resolved fixed
 2011-02-02 12:56:46 -08:00
Frank 735388ed79 Bug 8312 - Too high (10GB) of a free disk requirement for system VM templates 
status: resloved fixed
 2011-02-01 17:33:34 -08:00
Frank 9ca46b5b56 umount /mnt/cloud/systemvm if injectkey.sh failed or normal exit 2011-02-01 17:21:24 -08:00
Frank b6fc6341fd Bug 8303 - Cant add xen hosts, due to ssh key permission setup failure 
status 8303: resloved fixed
 2011-02-01 12:49:15 -08:00
Frank 3486995ae7 use sudo when mount systemvm.iso in injectkeys.sh 2011-01-31 12:51:21 -08:00
Frank 4d2d820634 fix injectkeys.sh -- pass systemvm.iso path to scripts 2011-01-31 12:19:32 -08:00
anthony 7ec201bc69 bug 5405: version file is not needed 
status 5405: resolved fixed
 2011-01-28 20:06:54 -08:00
anthony d838411957 remove unused xen scripts 2011-01-28 19:22:12 -08:00
anthony 19e7387702 build fix 2011-01-28 19:19:53 -08:00
will 153ec6b561 Initial Japanese language support - This one really requires another lookover. 2011-01-28 19:12:33 -08:00
anthony 9e63416da3 merge setupxenserver 2011-01-28 18:58:50 -08:00
Frank ec98a539b4 merge premium xenserver scripts to oss 2011-01-28 17:42:27 -08:00
Chiradeep Vittal 757bd0b5e4 bug 8254: point save password to right location 2011-01-28 16:01:52 -08:00
Chiradeep Vittal 5199167840 bug 8199: always update the keypairs on disk to account for multiple management servers 2011-01-28 13:09:11 -08:00
Chiradeep Vittal cc0ed77fee bug 8199: always update the keypairs on disk to account for multiple management servers 2011-01-28 12:24:22 -08:00
Chiradeep Vittal fd081dc5e7 Bug 8199: only inject if needed 2011-01-28 12:24:21 -08:00
Chiradeep Vittal 8a1ca01f44 Bug 8199: insert generated private key where it is expected 2011-01-28 12:24:20 -08:00
Chiradeep Vittal daa8439c00 Bug 8199: move private key into a more logical place 2011-01-28 12:24:19 -08:00
Chiradeep Vittal 09145efc41 Bug 8199: inject ssh public key into systemvm iso file 2011-01-28 12:24:18 -08:00
Frank 276e37115b open vswitch - Implement gre tunnel based network that doesn't use vlan 
it allows cross zone communication and no 4096 limitation introduced by vlan
 2011-01-21 17:32:02 -08:00
Edison Su 4b355ca301 bug 8118: add security group back 
status 8118: resolved fixed
 2011-01-22 04:04:52 -05:00
Chiradeep Vittal 34dc0695c2 Cleanup some scripts 2011-01-19 10:08:30 -08:00
Chiradeep Vittal 37598f182c bug 3981: Add more logs for long running operations, only for systemvm initial install 
status 3981: resolved fixed
 2011-01-18 17:21:05 -08:00
Chiradeep Vittal 8ca5028430 bug 3981: Add more logs for long running operations 2011-01-18 17:21:05 -08:00
Chiradeep Vittal 6a66fc58c2 bug 4390: check for 10G space in NFS mount and local 
status 4390: resolved fixed
 2011-01-18 14:29:09 -08:00
Chiradeep Vittal f1880942c3 bug 7288: report errors and bail 
status 7288 resolved fixed
 2011-01-18 14:29:09 -08:00
Frank e6b0346270 bug 7722: open vswitch - 
1. extend gre tunnel creating timeout to 30 secs
2. don't del drop flow since we don't delete gre tunnel
 2011-01-14 17:11:37 -08:00
Frank 39f75887b1 bug 7722: open vswitch - 
1. add more readable log when tunnel create failed
2. correct drop flow when port number more than 10

other fixs:
return false when vm is null in checkSessionPermision
this avoid null pointer Exception
 2011-01-14 13:47:50 -08:00
Frank 9e1c4ba779 bug 7722: open vswitch - set noflood flag to gre port 2011-01-13 19:52:03 -08:00
Chiradeep Vittal dd7f8625cc bug 7380: SNAT rules when there are multiple public interfaces 
bug 6854: port from 2.1.x
 2011-01-13 16:59:35 -08:00
Chiradeep Vittal 8ba1b2d33a bug 7380: SNAT rules when there are multiple public interfaces 2011-01-13 15:49:23 -08:00
Frank 488dd424aa bug 7722: open vswitch - 
fix a race condition, create tunnel sync
correct drop flow, this fix a flooding case which may cause openvswitch hang in kernel
 2011-01-13 13:53:35 -08:00
Frank c6683c2eab bug 7722: open vswitch - 
refine ovs plugin, create a separate plugin instead of messing with vmops
refine gre tunnel, maintains tunnel in database instead of plugin
fix an arp issue cause by overlap vlan range
 2011-01-11 02:55:36 -08:00
Frank c07d1be1aa bug 7722: open vswitch - fix issue that flows un-delete when VM stop 2011-01-10 14:34:31 -08:00
Frank a964494332 bug 7722: open vswitch - align some data type with master branch 2011-01-08 17:31:00 -08:00
Frank e9959d32a9 bug 7722: open vswitch - handle router when schedule a work 2011-01-08 16:28:47 -08:00
Frank ec643c7e59 bug 7722: open vswitch - refine code; add normal flow makes vswitch work as 
normal L2/L3, otherwise the output packet cannot find right output port
 2011-01-08 16:28:47 -08:00
Frank 6f9f8b145b bug 7722: open vswitch - complete 2011-01-08 16:28:47 -08:00
Frank 9d2916ffcc it works 2011-01-08 16:28:47 -08:00
Frank c94b6acadf bug 7722: open vswitch - works at VM start time, need fullsync() and flow clean in next 2011-01-08 16:22:59 -08:00
Frank 5c01c42ba7 fix bug 7722, code complete basic architecture 2011-01-08 16:20:39 -08:00
Chiradeep Vittal c6b027310d Merge in various security groups fixes from 2.1.x 2011-01-07 15:55:17 -08:00
anthony ad305ff6ac reuse session passed to plugin 2011-01-05 19:30:25 -08:00
anthony 791e14bb5f add more output for cloud-setup-bonding.sh 2011-01-05 19:12:39 -08:00
anthony b4dad6e9cc make the output more readable 2011-01-05 19:02:49 -08:00
anthony b732208c23 change file name 2011-01-04 10:39:05 -08:00
anthony 9249ee199f add setupBonding script 2011-01-03 19:22:07 -08:00
Edison Su c12526d4e0 %s/xen/xenserver 2011-01-04 09:42:11 -05: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
anthony bcc327cad1 correct path in patch file 2010-12-21 13:38:40 -08:00
edison eebb1021c1 fix security bug for kvm 2010-12-20 16:58:02 -08:00
edison ae4bd0fb70 fix a security group bug: restart mgt server or reconnect xenserver will destroy existing security group, then you can't ping user vm any more 2010-12-20 16:58:02 -08:00
anthony 2be0b45297 support xenserver 5.6 fp1 in oss 2010-12-20 14:18:10 -08:00
anthony baa6666897 create xenserver 5.6 patch file 2010-12-17 20:21:28 -08:00
anthony 44a8fdf918 fixed mount issue 2010-12-17 20:07:09 -08:00
anthony a8a6419bf4 remove scsiutil.py 2010-12-17 16:18:34 -08:00
anthony d35fbad6f5 get 5.6 NFSSR.py 2010-12-17 16:07:37 -08:00
anthony f1bdebb628 remove LUNperVDI.py 2010-12-17 16:02:11 -08:00
anthony 6ff038a9c3 delete ISCSISR.py 2010-12-17 15:53:43 -08:00
anthony c6633f9095 delete cleanup.py 2010-12-17 15:41:47 -08:00
edison 19431d31d3 add security group support for kvm 2010-12-16 18:02:41 -08:00
anthony fbbf78efbb intialize only get xenserver info 2010-12-14 15:24:21 -08:00
Frank Zhang 1017a41fa9 remove wscript from python/ 2010-12-04 23:03:24 -08:00
edison 5c73e46113 bug 7296: add kvm.public.network.device and kvm.private.network.device from UI 
status 7296: resolved fixed
 2010-12-04 20:01:10 -08:00
anthony ef9c9b8c5f split scripts to premium-script 2010-12-03 20:53:53 -08:00
anthony 4b20796467 remove patch domr logical 2010-12-01 16:32:33 -08:00
edison 254a59fc6c fix installrtng for vmware 2010-11-29 15:08:50 -08:00
edison 23d85f042b when re-seed systemvm template, we just need to specify hypervisor type, no need to the wired number 2010-11-23 19:15:14 -08:00
Anthony Xu 7518488672 bug 7293: return complete installpath for createprivatetemplatefromvolume 
status 7293: resolved fixed
 2010-11-23 16:22:51 -08:00
Anthony Xu 4d053964b6 remove zfs related staff, which is not used 2010-11-18 14:43:20 -08:00
Anthony Xu f62d9ae9c9 remove unused files 2010-11-18 14:43:20 -08:00
abhishek 239942bbe1 refactored all the commands to cater to keshav's needs, and added the new apis. the initial set of testing is complete, will now focus on corner cases 2010-11-11 13:07:26 -08:00
abhishek e5ca5dddf9 renaming the ip forwarding commands to port forwarding commands, and beginning to work on Keshav's request to modify the current 1-1 NAT to be compatible with the Amazon apis 2010-11-11 13:07:26 -08:00
edison 6944979f94 bug 7142: fix the race condition that multiple create vlan requests coming from mgt svr 
status 7142: resolved fixed
 2010-11-10 13:36:50 -08:00
edison 007783f6cf add more logs when taking heartbeat, and make ha enabled even in oss 2010-11-10 09:49:03 -08:00
edison 4bc63e5c32 Enable KVM HA on nfs storage 2010-11-09 22:03:22 -08:00
anthony 224da7e775 several snapshot fixes 2010-11-05 20:55:19 -07:00
Chiradeep Vittal 04f89d89ec bug 6981: merge from 2.1.x bug 6807 
status 6981: resolved fixed
 2010-11-04 12:45:46 -07:00
Chiradeep Vittal 900d597002 bug 6981: merge from 2.1.x 2010-11-04 12:30:55 -07:00
Chiradeep Vittal 542a6da0d7 bug 6981: restore ipassoc behaviour 2010-11-04 11:53:42 -07:00
anthony ff5ea1eabd merge from 2.1.x 74b798240c 
1. remove plugin check Sr, heartbeat does that
    2. if pbd.plug fails, moves on, and report warnning
 2010-11-03 19:36:25 -07:00
anthony 003b0e4a23 merge from 2.1.x 86d02eaa15 
delete all snapshut which has been backed up to secondary storage
change dd block size from 512 to 1M, make taking snapstho faster for iscsi primary storage
 2010-11-03 19:05:23 -07:00
anthony 25c0d0f197 patch.tgz and prepsystemvm.sh are not needed, we use iso instead 2010-11-03 17:19:04 -07:00
edison 4d7d09a7a8 fix the import vmware template 2010-11-01 18:33:34 -07:00
Chiradeep Vittal 8dda98a1bb fix problems after merging in bug fixes from 2.1.x 2010-11-01 12:31:10 -07:00
Chiradeep Vittal d6a2766c04 dont wipe dhcp and antispoof rules every time 2010-11-01 12:21:56 -07:00
Chiradeep Vittal 3c897c5b27 bug 5532: allow more instances. could still fail with a very long instance name 2010-11-01 12:21:56 -07:00
Chiradeep Vittal c1b7f5a6fa bug 6485: fix reboot logic 2010-11-01 12:21:56 -07:00
Chiradeep Vittal 2c14634e3b bug 6268: cloud-private is actually the management interface 2010-11-01 12:21:55 -07:00
Chiradeep Vittal 1e0eb04442 Add VPN apis, some systemvm changes for vpn 2010-11-01 10:27:49 -07:00
kishan c40f053eb0 bug 6425: run ssh in quiet mode to avoid warning 
status 6425: resolved fixed
 2010-11-01 16:03:39 +05:30
anthony cc6b43d58d bug 6546: support ubuntu 10.04 PV kernel, 
for ext3 requirement, we can file a seperate bug for it, the solution should be install ext4 module in xenserver

    status 6546: resolved fixed
 2010-10-21 18:28:31 -07:00
Kris McQueen f964470ba4 remove whitespace at the start of the file which confuses the interpreter and prevents plugins from working 2010-10-20 16:48:20 -07:00
anthony 4cca3f9b87 when get scsi_id, replace all whitespaces by underscores 2010-10-20 13:55:14 -07:00
anthony 121d29211e update new keypair 2010-10-15 15:50:53 -07:00
anthony b66203ebca empty it instead of rm it 2010-10-15 15:05:22 -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
anthony 93f3205a84 change the script 2010-10-07 23:24:25 -07:00
edison 3028dab141 fix systemvm template in direct attached mode, guest vm can't get gateway and dns server 2010-10-07 16:32:46 -07:00
Kelven Yang 15f5fa5c1d Make installrtng.sh support vmware template 2010-10-07 11:19:04 -07:00
edison 139ff273ff fix systemvm template for kvm, using chiradeep's latest debian template 2010-10-05 20:41:39 -07:00
anthony 319d4f1aa0 snapshot redesign 
1. use full snapshot and delta snapshot, there are maxsnashot/2 of delta snapshot between two full snapshot
2. only support one policy for one volume
3. remove all coleases in secondary storage.
 2010-09-28 18:37:46 -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 50c319e19b bug 3120: incremental checkin 2010-09-21 14:47:52 -07:00
abhishek 37870da95f bug 3120: incremental fix 2010-09-21 14:47:51 -07:00
abhishek e6cfacacfe some more ipassoc changes 2010-09-21 14:47:51 -07:00
abhishek a9c96b4da0 bug 3120: incremental checkin 2010-09-20 14:54:06 -07:00
abhishek 437f717633 bug 3120: incremental checkin 2010-09-20 14:54:06 -07:00
kishan c5610eab4b Bug 6175: Added rules to account HAProxy traffic 2010-09-17 12:00:32 +05:30
edison d933f19d35 bug 5800: add cluster for KVM 
TODO: need to make sure the host cpu is from the same vender in a cluster
 2010-09-10 16:00:36 -07:00
Chiradeep Vittal 71cae63323 vhd.size not filled in depending on where the script is run from 2010-09-09 15:12:06 -07:00
anthony 0d55059583 remove some SMlog 2010-09-09 13:59:31 -07:00
Alex Huang 7249f168d5 more file changes 2010-09-09 13:27:20 -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
anthony 56b33b578c bug 5944: add basical vhd file check 
status 5994: resolved fixed
 2010-08-31 19:44:18 -07:00
anthony 5d8cadb7b0 correctly use session in plugin 2010-08-29 23:59:33 -07:00
anthony afd8052203 remove unused scripts 2010-08-29 18:39:15 -07:00
anthony a517338ac7 fix a bug about backupsnapshot to nfs primary storage 2010-08-28 19:17:40 -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
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
edison 867b49edb6 Don't install console proxy agent on agent 2010-08-25 15:26: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
Anthony Xu 09680d80a7 bug 5939: add the new script to patch 
status 5939: assigned
 2010-08-18 16:59:04 -07:00
Anthony Xu 334b2f7d27 bug 5939: script to clean xenstore disk 2010-08-16 17:06:20 -07:00
edison 53df26daaa "Add host" for kvm: 
The sequence:
1. add host in UI
2. scp setup_agent.sh to agent host, and execute it. This script receives hostip,zoneid, podid and guid, then runs "cloud-setup-agent" and "cloud-setup-console-proxy". Here, we assume that network/hostname and cloud-agent are already configed and installed.
3. Write a dummy kvm resource into the database, then wait for agent connects to server, by polling the database for every 1 minutes. If it finds the agent is in UP state in database, then return, or wait for at least 10 minutes.
 2010-08-13 23:19:36 -07:00
edison dc005b9b9c add setup_agent.sh, the first script running during add host 
Make cloud-setup-agent/console-proxy in unattended mode
 2010-08-11 19:31:07 -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