Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C9B9B139A for ; Tue, 26 Apr 2011 23:24:57 +0000 (UTC) Received: (qmail 51447 invoked by uid 500); 26 Apr 2011 23:24:57 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 51403 invoked by uid 500); 26 Apr 2011 23:24:57 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 51396 invoked by uid 99); 26 Apr 2011 23:24:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Apr 2011 23:24:57 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Apr 2011 23:24:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C302E2388978; Tue, 26 Apr 2011 23:24:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1096964 - in /geronimo/server: trunk-copy/ trunk/ Date: Tue, 26 Apr 2011 23:24:36 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110426232436.C302E2388978@eris.apache.org> Author: djencks Date: Tue Apr 26 23:24:36 2011 New Revision: 1096964 URL: http://svn.apache.org/viewvc?rev=1096964&view=rev Log: restore trunk from copy Added: geronimo/server/trunk/ (props changed) - copied from r1096963, geronimo/server/trunk-copy/ Removed: geronimo/server/trunk-copy/ Propchange: geronimo/server/trunk/ ------------------------------------------------------------------------------ --- svk:merge (added) +++ svk:merge Tue Apr 26 23:24:36 2011 @@ -0,0 +1,4 @@ +13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/m2migration:428851 +13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk:428882 +bdd66121-cd02-4950-91dc-3687ae657a63:/geronimo/server-trunk:16301 +bdd66121-cd02-4950-91dc-3687ae657a63:/geronimo/trunk-reorg:12578 Propchange: geronimo/server/trunk/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Apr 26 23:24:36 2011 @@ -0,0 +1,10 @@ +*.iws +*.ipr +*.iml +.project +.classpath +*.log +junit*.properties +target +bin +.settings Propchange: geronimo/server/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Apr 26 23:24:36 2011 @@ -0,0 +1,2 @@ +/geronimo/server/branches/2.2:832538,885058 +/geronimo/server/branches/3.0-M1:948864,951792