Return-Path: X-Original-To: apmail-site-dev-archive@www.apache.org Delivered-To: apmail-site-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9EB6E18B90 for ; Tue, 13 Oct 2015 15:09:39 +0000 (UTC) Received: (qmail 20651 invoked by uid 500); 13 Oct 2015 15:09:27 -0000 Delivered-To: apmail-site-dev-archive@apache.org Received: (qmail 20522 invoked by uid 500); 13 Oct 2015 15:09:26 -0000 Mailing-List: contact site-dev-help@apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list site-dev@apache.org Received: (qmail 20512 invoked by uid 99); 13 Oct 2015 15:09:26 -0000 Received: from mail-relay.apache.org (HELO mail-relay.apache.org) (140.211.11.15) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Oct 2015 15:09:26 +0000 Received: from mail-io0-f180.google.com (mail-io0-f180.google.com [209.85.223.180]) by mail-relay.apache.org (ASF Mail Server at mail-relay.apache.org) with ESMTPSA id AC82D1A031E for ; Tue, 13 Oct 2015 15:09:26 +0000 (UTC) Received: by ioii196 with SMTP id i196so24066839ioi.3 for ; Tue, 13 Oct 2015 08:09:26 -0700 (PDT) MIME-Version: 1.0 X-Received: by 10.107.166.201 with SMTP id p192mr40943078ioe.0.1444748966081; Tue, 13 Oct 2015 08:09:26 -0700 (PDT) Reply-To: coreyg@apache.org Received: by 10.79.84.7 with HTTP; Tue, 13 Oct 2015 08:09:26 -0700 (PDT) In-Reply-To: References: <20151013041908.0F4283A024F@svn01-us-west.apache.org> Date: Tue, 13 Oct 2015 08:09:26 -0700 Message-ID: Subject: Re: svn commit: r1708283 - /infrastructure/site/trunk/content/dev/machines.mdtext From: Geoffrey Corey To: sebb Cc: ASF Site-Dev Content-Type: multipart/alternative; boundary=001a1141f338e9cbd30521fdd4cb --001a1141f338e9cbd30521fdd4cb Content-Type: text/plain; charset=UTF-8 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 wrote: > On 13 October 2015 at 05:19, 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: ### > > > > > --001a1141f338e9cbd30521fdd4cb Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Weird. I made the hades -> themis edit, then it said th= ere 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 <sebbaz@gmail.com> wrote:=
On 13 October 2015 at 05:19,=C2=A0 <<= a href=3D"mailto:coreyg@apache.org">coreyg@apache.org> wrote:
> Author: coreyg
> Date: Tue Oct 13 04:19:06 2015
> New Revision: 1708283
>
> URL: http://svn.apache.org/viewvc?rev= =3D1708283&view=3Drev
> Log:
> update hades to themis
>
> Modified:
>=C2=A0 =C2=A0 =C2=A0infrastructure/site/trunk/content/dev/machines.mdte= xt
>
> Modified: infrastructure/site/trunk/content/dev/machines.mdtext
> URL: http://svn.apache.o= rg/viewvc/infrastructure/site/trunk/content/dev/machines.mdtext?rev=3D17082= 83&r1=3D1708282&r2=3D1708283&view=3Ddiff
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D
> --- infrastructure/site/trunk/content/dev/machines.mdtext (original) > +++ infrastructure/site/trunk/content/dev/machines.mdtext Tue Oct 13 0= 4:19:06 2015
> @@ -48,8 +48,6 @@ Notice:=C2=A0 =C2=A0 Licensed to the Apache Softwa >=C2=A0 | Name | Os | HW | CPU | RAM | Disk | Arrays | Services | Locati= on | Comissioned | Class |
>=C2=A0 |^-----|----|----|-----|-----|------|--------|----------|-------= ---|-------------|-------|
>=C2=A0 | arcas | 12.04.2 LTS | r410 | X5550@2.67GHz 2x4x2=3D16 | 8x8GB@= 1333MHz =3D 64GB | | | Jira | OSUOSL | 2010/07 | jira |
> -| crius | 12.04.5 LTS | r720 | E5-2665@2.6GHz | 4x16=3D64 @ 1600MHz| = 1x200SSD + 2x300SAS RAID1 + 5 x 600SAS |=C2=A0 | CI (Jenkins Master) | OSUO= SL | 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=3D12 | 32x8GB@160= 0MHz =3D 256GB | 6x300GB SSD | | Subversion | OSUOSL | 2014/08 | subversion= |
>=C2=A0 | lares | 14.04 LTS | HP Proliant DL180 G6=C2=A0 |=C2=A0 | 50GB = |=C2=A0 |=C2=A0 | CI (Buildbot slave) | Y! | 2014/07 | ci, bb |
>=C2=A0 | orcus | 14.04 LTS | HP Proliant DL180 G6=C2=A0 |=C2=A0 | 50GB = |=C2=A0 |=C2=A0 | CI (Buildbot slave) | Y! | 2014/07 | ci, bb |
>=C2=A0 | penates | 14.04 LTS | HP Proliant DL180 G6=C2=A0 |=C2=A0 | 50G= B |=C2=A0 |=C2=A0 | CI (Jenkins slave) | Y! | 2014/07 | ci, jenkins |
> @@ -60,6 +58,7 @@ Notice:=C2=A0 =C2=A0 Licensed to the Apache Softwa >=C2=A0 | silvanus | 14.04 LTS | HP Proliant DL180 G6=C2=A0 |=C2=A0 | 50= GB |=C2=A0 |=C2=A0 | CI (Buildbot slave) | Y! | 2014/07 | ci, bb |
>=C2=A0 | hemera | 12.04.2 LTS | HP ProLiant DL380 G7 | X5670 2x6=3D12 |= 24GB | 2x146GB@15k raid 1+1 6x600GB@10k raid5+hs | | CI (Buildbot + Jenkin= s Slave) | OSUOSL | 2011/06 | ci, bb, jenkins
>=C2=A0 | tethys | 10.04.4 LTS | DPE r510 | 2x6=3D12 | 32GB | 2x100GB SS= D raid 1 + 6x600 SAS raid 6 (5 + hs) |=C2=A0 | CI (Buildbot)| OSUOSL | 2010= /12 | ci, bb |
> +| themis | 14.04 LTS | DPE r720 | E5-2665@2.4GHz 2x6=3D12 | 32x8GB@16= 00MHz =3D 256GB | 6x300GB SSD | | Websites | OSUOSL | 2014/08 | tlp |
>
>
>=C2=A0 ### MacOSX: ###
>
>

--001a1141f338e9cbd30521fdd4cb--