Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 47264 invoked from network); 13 Oct 2008 14:00:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Oct 2008 14:00:36 -0000 Received: (qmail 87758 invoked by uid 500); 13 Oct 2008 14:00:36 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 87734 invoked by uid 500); 13 Oct 2008 14:00:36 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 87725 invoked by uid 99); 13 Oct 2008 14:00:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Oct 2008 07:00:36 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Mon, 13 Oct 2008 13:59:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A92EC23888A0; Mon, 13 Oct 2008 07:00:14 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r704127 - in /felix/sandbox/clement/tags/ipojo-0.9.0: ./ handler/eventadmin/ handler/eventadmin/doc/ handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/ handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/ev... Date: Mon, 13 Oct 2008 14:00:14 -0000 To: commits@felix.apache.org From: clement@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081013140014.A92EC23888A0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: clement Date: Mon Oct 13 07:00:14 2008 New Revision: 704127 URL: http://svn.apache.org/viewvc?rev=704127&view=rev Log: Merge the branch with the latest trunk changes (update the date of the release in two changelog files). Modified: felix/sandbox/clement/tags/ipojo-0.9.0/ (props changed) felix/sandbox/clement/tags/ipojo-0.9.0/handler/eventadmin/doc/changelog.txt felix/sandbox/clement/tags/ipojo-0.9.0/handler/eventadmin/metadata.xml (props changed) felix/sandbox/clement/tags/ipojo-0.9.0/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/EventUtil.java (props changed) felix/sandbox/clement/tags/ipojo-0.9.0/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/publisher/ (props changed) felix/sandbox/clement/tags/ipojo-0.9.0/handler/jmx/doc/changelog.txt Propchange: felix/sandbox/clement/tags/ipojo-0.9.0/ ------------------------------------------------------------------------------ svn:mergeinfo = /felix/trunk/ipojo:704119 Modified: felix/sandbox/clement/tags/ipojo-0.9.0/handler/eventadmin/doc/changelog.txt URL: http://svn.apache.org/viewvc/felix/sandbox/clement/tags/ipojo-0.9.0/handler/eventadmin/doc/changelog.txt?rev=704127&r1=704126&r2=704127&view=diff ============================================================================== --- felix/sandbox/clement/tags/ipojo-0.9.0/handler/eventadmin/doc/changelog.txt (original) +++ felix/sandbox/clement/tags/ipojo-0.9.0/handler/eventadmin/doc/changelog.txt Mon Oct 13 07:00:14 2008 @@ -1,3 +1,3 @@ Version 1.0.0 ------------- - * Initial release (XXXX-XX-XX) \ No newline at end of file + * Initial release (2008-10-13) \ No newline at end of file Propchange: felix/sandbox/clement/tags/ipojo-0.9.0/handler/eventadmin/metadata.xml ('svn:mergeinfo' removed) Propchange: felix/sandbox/clement/tags/ipojo-0.9.0/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/EventUtil.java ('svn:mergeinfo' removed) Propchange: felix/sandbox/clement/tags/ipojo-0.9.0/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/publisher/ ('svn:mergeinfo' removed) Modified: felix/sandbox/clement/tags/ipojo-0.9.0/handler/jmx/doc/changelog.txt URL: http://svn.apache.org/viewvc/felix/sandbox/clement/tags/ipojo-0.9.0/handler/jmx/doc/changelog.txt?rev=704127&r1=704126&r2=704127&view=diff ============================================================================== --- felix/sandbox/clement/tags/ipojo-0.9.0/handler/jmx/doc/changelog.txt (original) +++ felix/sandbox/clement/tags/ipojo-0.9.0/handler/jmx/doc/changelog.txt Mon Oct 13 07:00:14 2008 @@ -1,3 +1,3 @@ Version 1.0.0 ------------- - * Initial release (XXXX-XX-XX) \ No newline at end of file + * Initial release (2008-10-13) \ No newline at end of file