diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2013-09-26 15:18:15 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2013-09-26 15:18:15 +0200 |
| commit | 2c18eac2140a577090c84854905728ebd2ce0fac (patch) | |
| tree | 799129f165d6dc77a652fe574c7e8c4761e9625d /public_hurd_boxen.mdwn | |
| parent | bba1488c7be842e5d0311ffa6541373d63b1164c (diff) | |
| parent | ce4899ded119f3607515cc54252c4bad7224f804 (diff) | |
| download | web-2c18eac2140a577090c84854905728ebd2ce0fac.tar.gz web-2c18eac2140a577090c84854905728ebd2ce0fac.tar.bz2 web-2c18eac2140a577090c84854905728ebd2ce0fac.zip | |
Merge commit 'ce4899ded119f3607515cc54252c4bad7224f804'
Conflicts:
community/gsoc/project_ideas/mtab.mdwn
contributing.mdwn
hurd/translator/eth-filter.mdwn
hurd/translator/socketio.mdwn
open_issues/exec.mdwn
open_issues/gnumach_vm_object_resident_page_count.mdwn
public_hurd_boxen.mdwn
Diffstat (limited to 'public_hurd_boxen.mdwn')
| -rw-r--r-- | public_hurd_boxen.mdwn | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/public_hurd_boxen.mdwn b/public_hurd_boxen.mdwn index 4c7b3e24..b5ffcdc1 100644 --- a/public_hurd_boxen.mdwn +++ b/public_hurd_boxen.mdwn @@ -29,10 +29,10 @@ image|hurd/running/qemu]]. "[[bddebian]]","goober","Debian GNU/Hurd","?" "[[bddebian]]","grubber","Debian GNU/Hurd","Celeron 2.2 GHz; 554 MiB","Xen domU on [[zenhost]]; for experimental stuff" "[[bddebian]]","[[zenhost]]","Debian GNU/Linux","Celeron 2.2 GHz","Xen dom0 for several hosts" -"[[sceen]]","darnassus","Debian GNU/Hurd","Core i5 3.1 GHz, 1.8 GiB","KVM guest on shattrath; public Hurd box; [web server](http://darnassus.sceen.net/)" -"[[sceen]]","ironforge","Debian GNU/Hurd","Core i5 3.1 GHz, 1.8 GiB","KVM guest on shattrath; Debian buildd" -"[[sceen]]","exodar","Debian GNU/Hurd","Core i5 3.1 GHz, 1.8 GiB","KVM guest on shattrath; Debian porterbox, all Debian Developers have access" -"[[sceen]]","shattrath","Debian GNU/Linux","Core i5 3.1 GHz","KVM host" +"[[sceen]]","darnassus","Debian GNU/Hurd","Xeon E5-1620 3.6 GHz, 1.8 GiB","KVM guest on dalaran; public Hurd box; [web server](http://darnassus.sceen.net/)" +"[[sceen]]","ironforge","Debian GNU/Hurd","Xeon E5-1620 3.6 GHz, 1.8 GiB","KVM guest on dalaran; Debian buildd" +"[[sceen]]","exodar","Debian GNU/Hurd","Xeon E5-1620 3.6 GHz, 1.8 GiB","KVM guest on dalaran; Debian porterbox, all Debian Developers have access" +"[[sceen]]","dalaran","Debian GNU/Linux","Xeon E5-1620 3.6 GHz, 64 GiB ECC","KVM host" "Debian","strauss","Debian GNU/Hurd","Sempron 2800+","all Debian Developers have access" "[libav](http://www.libav.org/)","[x86_32-hurd-gcc-4.7](http://fate.libav.org/x86_32-hurd-gcc-4.7)","Debian GNU/Hurd","","libav instance of the [FATE Automated Test Environment](http://www.libav.org/fate.html)" """]] |