Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3141D706A for ; Sun, 2 Oct 2011 08:30:28 +0000 (UTC) Received: (qmail 20933 invoked by uid 500); 2 Oct 2011 08:30:28 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 20902 invoked by uid 500); 2 Oct 2011 08:30:28 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 20894 invoked by uid 99); 2 Oct 2011 08:30:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Oct 2011 08:30:28 +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; Sun, 02 Oct 2011 08:30:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CC98D23888CD for ; Sun, 2 Oct 2011 08:30:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1178146 - in /camel/branches/camel-2.7.x/camel-core/src: main/java/org/apache/camel/component/file/GenericFileConverter.java test/java/org/apache/camel/component/file/GenericFileConverterTest.java Date: Sun, 02 Oct 2011 08:30:04 -0000 To: commits@camel.apache.org From: ningjiang@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111002083004.CC98D23888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ningjiang Date: Sun Oct 2 08:30:04 2011 New Revision: 1178146 URL: http://svn.apache.org/viewvc?rev=1178146&view=rev Log: Remove the svn:mergeinfo property of the GenericFileConverter Modified: camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java (props changed) camel/branches/camel-2.7.x/camel-core/src/test/java/org/apache/camel/component/file/GenericFileConverterTest.java (props changed) Propchange: camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java ('svn:mergeinfo' removed) Propchange: camel/branches/camel-2.7.x/camel-core/src/test/java/org/apache/camel/component/file/GenericFileConverterTest.java ('svn:mergeinfo' removed)