You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-dev@apache.org by sebb <se...@gmail.com> on 2015/10/13 12:05:33 UTC
Re: svn commit: r1708283 - /infrastructure/site/trunk/content/dev/machines.mdtext
On 13 October 2015 at 05:19, <co...@apache.org> wrote:
> Author: coreyg
> Date: Tue Oct 13 04:19:06 2015
> New Revision: 1708283
>
> URL: http://svn.apache.org/viewvc?rev=1708283&view=rev
> Log:
> update hades to themis
>
> Modified:
> infrastructure/site/trunk/content/dev/machines.mdtext
>
> Modified: infrastructure/site/trunk/content/dev/machines.mdtext
> URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/content/dev/machines.mdtext?rev=1708283&r1=1708282&r2=1708283&view=diff
> ==============================================================================
> --- infrastructure/site/trunk/content/dev/machines.mdtext (original)
> +++ infrastructure/site/trunk/content/dev/machines.mdtext Tue Oct 13 04:19:06 2015
> @@ -48,8 +48,6 @@ Notice: Licensed to the Apache Softwa
> | Name | Os | HW | CPU | RAM | Disk | Arrays | Services | Location | Comissioned | Class |
> |^-----|----|----|-----|-----|------|--------|----------|----------|-------------|-------|
> | arcas | 12.04.2 LTS | r410 | X5550@2.67GHz 2x4x2=16 | 8x8GB@1333MHz = 64GB | | | Jira | OSUOSL | 2010/07 | jira |
> -| crius | 12.04.5 LTS | r720 | E5-2665@2.6GHz | 4x16=64 @ 1600MHz| 1x200SSD + 2x300SAS RAID1 + 5 x 600SAS | | CI (Jenkins Master) | OSUOSL | 2013/06 | ci, jenkins |
Did you mean to remove crius?
It's not mentioned in the log message.
> -| hades | 14.04 LTS | DPE r720 | E5-2665@2.4GHz 2x6=12 | 32x8GB@1600MHz = 256GB | 6x300GB SSD | | Subversion | OSUOSL | 2014/08 | subversion |
> | lares | 14.04 LTS | HP Proliant DL180 G6 | | 50GB | | | CI (Buildbot slave) | Y! | 2014/07 | ci, bb |
> | orcus | 14.04 LTS | HP Proliant DL180 G6 | | 50GB | | | CI (Buildbot slave) | Y! | 2014/07 | ci, bb |
> | penates | 14.04 LTS | HP Proliant DL180 G6 | | 50GB | | | CI (Jenkins slave) | Y! | 2014/07 | ci, jenkins |
> @@ -60,6 +58,7 @@ Notice: Licensed to the Apache Softwa
> | silvanus | 14.04 LTS | HP Proliant DL180 G6 | | 50GB | | | CI (Buildbot slave) | Y! | 2014/07 | ci, bb |
> | hemera | 12.04.2 LTS | HP ProLiant DL380 G7 | X5670 2x6=12 | 24GB | 2x146GB@15k raid 1+1 6x600GB@10k raid5+hs | | CI (Buildbot + Jenkins Slave) | OSUOSL | 2011/06 | ci, bb, jenkins
> | tethys | 10.04.4 LTS | DPE r510 | 2x6=12 | 32GB | 2x100GB SSD raid 1 + 6x600 SAS raid 6 (5 + hs) | | CI (Buildbot)| OSUOSL | 2010/12 | ci, bb |
> +| themis | 14.04 LTS | DPE r720 | E5-2665@2.4GHz 2x6=12 | 32x8GB@1600MHz = 256GB | 6x300GB SSD | | Websites | OSUOSL | 2014/08 | tlp |
>
>
> ### MacOSX: ###
>
>
Re: svn commit: r1708283 - /infrastructure/site/trunk/content/dev/machines.mdtext
Posted by Geoffrey Corey <co...@apache.org>.
Weird. I made the hades -> themis edit, then it said there was a merge
conflict, and I thought I had resolved it. crius is back in now.
On Tue, Oct 13, 2015 at 3:05 AM, sebb <se...@gmail.com> wrote:
> On 13 October 2015 at 05:19, <co...@apache.org> wrote:
> > Author: coreyg
> > Date: Tue Oct 13 04:19:06 2015
> > New Revision: 1708283
> >
> > URL: http://svn.apache.org/viewvc?rev=1708283&view=rev
> > Log:
> > update hades to themis
> >
> > Modified:
> > infrastructure/site/trunk/content/dev/machines.mdtext
> >
> > Modified: infrastructure/site/trunk/content/dev/machines.mdtext
> > URL:
> http://svn.apache.org/viewvc/infrastructure/site/trunk/content/dev/machines.mdtext?rev=1708283&r1=1708282&r2=1708283&view=diff
> >
> ==============================================================================
> > --- infrastructure/site/trunk/content/dev/machines.mdtext (original)
> > +++ infrastructure/site/trunk/content/dev/machines.mdtext Tue Oct 13
> 04:19:06 2015
> > @@ -48,8 +48,6 @@ Notice: Licensed to the Apache Softwa
> > | Name | Os | HW | CPU | RAM | Disk | Arrays | Services | Location |
> Comissioned | Class |
> >
> |^-----|----|----|-----|-----|------|--------|----------|----------|-------------|-------|
> > | arcas | 12.04.2 LTS | r410 | X5550@2.67GHz 2x4x2=16 | 8x8GB@1333MHz
> = 64GB | | | Jira | OSUOSL | 2010/07 | jira |
> > -| crius | 12.04.5 LTS | r720 | E5-2665@2.6GHz | 4x16=64 @ 1600MHz|
> 1x200SSD + 2x300SAS RAID1 + 5 x 600SAS | | CI (Jenkins Master) | OSUOSL |
> 2013/06 | ci, jenkins |
>
> Did you mean to remove crius?
>
> It's not mentioned in the log message.
>
> > -| hades | 14.04 LTS | DPE r720 | E5-2665@2.4GHz 2x6=12 | 32x8GB@1600MHz
> = 256GB | 6x300GB SSD | | Subversion | OSUOSL | 2014/08 | subversion |
> > | lares | 14.04 LTS | HP Proliant DL180 G6 | | 50GB | | | CI
> (Buildbot slave) | Y! | 2014/07 | ci, bb |
> > | orcus | 14.04 LTS | HP Proliant DL180 G6 | | 50GB | | | CI
> (Buildbot slave) | Y! | 2014/07 | ci, bb |
> > | penates | 14.04 LTS | HP Proliant DL180 G6 | | 50GB | | | CI
> (Jenkins slave) | Y! | 2014/07 | ci, jenkins |
> > @@ -60,6 +58,7 @@ Notice: Licensed to the Apache Softwa
> > | silvanus | 14.04 LTS | HP Proliant DL180 G6 | | 50GB | | | CI
> (Buildbot slave) | Y! | 2014/07 | ci, bb |
> > | hemera | 12.04.2 LTS | HP ProLiant DL380 G7 | X5670 2x6=12 | 24GB |
> 2x146GB@15k raid 1+1 6x600GB@10k raid5+hs | | CI (Buildbot + Jenkins
> Slave) | OSUOSL | 2011/06 | ci, bb, jenkins
> > | tethys | 10.04.4 LTS | DPE r510 | 2x6=12 | 32GB | 2x100GB SSD raid 1
> + 6x600 SAS raid 6 (5 + hs) | | CI (Buildbot)| OSUOSL | 2010/12 | ci, bb |
> > +| themis | 14.04 LTS | DPE r720 | E5-2665@2.4GHz 2x6=12 |
> 32x8GB@1600MHz = 256GB | 6x300GB SSD | | Websites | OSUOSL | 2014/08 |
> tlp |
> >
> >
> > ### MacOSX: ###
> >
> >
>