From dev-return-8121-apmail-continuum-dev-archive=continuum.apache.org@continuum.apache.org Tue May 19 00:46:45 2009 Return-Path: Delivered-To: apmail-continuum-dev-archive@www.apache.org Received: (qmail 68802 invoked from network); 19 May 2009 00:46:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 19 May 2009 00:46:44 -0000 Received: (qmail 71957 invoked by uid 500); 19 May 2009 00:46:44 -0000 Delivered-To: apmail-continuum-dev-archive@continuum.apache.org Received: (qmail 71876 invoked by uid 500); 19 May 2009 00:46:43 -0000 Mailing-List: contact dev-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list dev@continuum.apache.org Received: (qmail 71866 invoked by uid 99); 19 May 2009 00:46:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 May 2009 00:46:43 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of jmorales@gmv.com designates 212.0.110.25 as permitted sender) Received: from [212.0.110.25] (HELO mx1.gmv.es) (212.0.110.25) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 May 2009 00:46:34 +0000 Received: HReceived: from scanmail.gmv.es (caronte [212.0.110.2]) by mx1.gmv.es with id n4J0k9oD008942 for ; Tue, 19 May 2009 02:46:09 +0200 From: =?iso-8859-1?Q?Jos=E9_Morales_Mart=EDnez?= To: "dev@continuum.apache.org" Date: Tue, 19 May 2009 02:46:09 +0200 Subject: RE: svn commit: r776132 - in /continuum/trunk/continuum-webapp/src/main: resources/localization/Continuum.properties webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp Thread-Topic: svn commit: r776132 - in /continuum/trunk/continuum-webapp/src/main: resources/localization/Continuum.properties webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp Thread-Index: AcnYD7VbO32SpvLfRuCOMiHdDAUKfAACqS2Y Message-ID: References: <20090518231703.10B742388898@eris.apache.org>, In-Reply-To: Accept-Language: es-ES Content-Language: es-ES X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: es-ES Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Disposition: inline X-Scanned-By: MIMEDefang 2.64 on 212.0.110.25 X-Virus-Checked: Checked by ClamAV on apache.org Sorry. I though with merge info was sufficient. I will take this notation : [CONTINUUM-XXXX] merge revision VVVVVV from branch BBBBBB This merge is about [CONTINUUM-2016]. ----- Jose ________________________________________ De: Wendy Smoak [wsmoak@gmail.com] Enviado el: martes, 19 de mayo de 2009 1:22 Para: dev@continuum.apache.org Asunto: Re: svn commit: r776132 - in /continuum/trunk/continuum-webapp/src/= main: resources/localization/Continuum.properties webapp/WEB-INF/jsp= /admin/editPurgeConfiguration.jsp I know it's just a one-line change, but can you please include the reason and/or JIRA issue in the commit message for the merge? You can fix the commit log message after the fact with "svn propedit --revprop -r12345 svn:log" ('svn help propedit' for more info.) Thanks, -- Wendy On Mon, May 18, 2009 at 4:17 PM, wrote: > Author: jmorales > Date: Mon May 18 23:17:02 2009 > New Revision: 776132 > > URL: http://svn.apache.org/viewvc?rev=3D776132&view=3Drev > Log: > merge -r 775956:776127 from 1.3.x branch > > Modified: > continuum/trunk/continuum-webapp/src/main/resources/localization/Conti= nuum.properties > continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/edi= tPurgeConfiguration.jsp > > Modified: continuum/trunk/continuum-webapp/src/main/resources/localizatio= n/Continuum.properties > URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/ma= in/resources/localization/Continuum.properties?rev=3D776132&r1=3D776131&r2= =3D776132&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 > --- continuum/trunk/continuum-webapp/src/main/resources/localization/Cont= inuum.properties (original) > +++ continuum/trunk/continuum-webapp/src/main/resources/localization/Cont= inuum.properties Mon May 18 23:17:02 2009 > @@ -1000,7 +1000,7 @@ > purgeConfig.defaultPurge.label =3D Is it Default? > purgeConfig.schedule.label =3D Schedule > purgeConfig.description.label =3D Description > -purgeConfig.enabled.label =3D Enabled > +purgeConfig.enabled.label =3D Enabled Purge Configuration > purgeConfig.no.repositories =3D No repositories to purge > > #----------------------------------------------------------------------- > > Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/ad= min/editPurgeConfiguration.jsp > URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/ma= in/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp?rev=3D776132&r1=3D77= 6131&r2=3D776132&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 > --- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/ed= itPurgeConfiguration.jsp (original) > +++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/ed= itPurgeConfiguration.jsp Mon May 18 23:17:02 2009 > @@ -68,6 +68,7 @@ > headerKey=3D"-1" headerValue=3D""/> > > + > > > > > > ______________________ Este mensaje, y en su caso, cualquier fichero anexo al mismo, puede contener informacion clasificada por su emisor como confidencial en el marco de su Sistema de Gestion de Seguridad de la=20 Informacion siendo para uso exclusivo del destinatario, quedando=20 prohibida su divulgacion copia o distribucion a terceros sin la=20 autorizacion expresa del remitente. Si Vd. ha recibido este mensaje=20 erroneamente, se ruega lo notifique al remitente y proceda a su borrado.= =20 Gracias por su colaboracion. ______________________ This message including any attachments may contain confidential=20 information, according to our Information Security Management System, and intended solely for a specific individual to whom they are addressed. Any unauthorised copy, disclosure or distribution of this message is strictly forbidden. If you have received this transmission in error, please notify the sender immediately and delete it. ______________________