Return-Path: X-Original-To: apmail-incubator-mrunit-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-mrunit-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DD6037171 for ; Wed, 26 Oct 2011 13:35:56 +0000 (UTC) Received: (qmail 23452 invoked by uid 500); 26 Oct 2011 13:35:55 -0000 Delivered-To: apmail-incubator-mrunit-commits-archive@incubator.apache.org Received: (qmail 23425 invoked by uid 500); 26 Oct 2011 13:35:55 -0000 Mailing-List: contact mrunit-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mrunit-dev@incubator.apache.org Delivered-To: mailing list mrunit-commits@incubator.apache.org Received: (qmail 23389 invoked by uid 99); 26 Oct 2011 13:35:55 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Oct 2011 13:35:55 +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; Wed, 26 Oct 2011 13:35:54 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6790423889DA; Wed, 26 Oct 2011 13:35:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1189207 - in /incubator/mrunit/branches/mrunit-0.5.0: ./ src/main/assembly/dist.xml Date: Wed, 26 Oct 2011 13:35:34 -0000 To: mrunit-commits@incubator.apache.org From: brock@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111026133534.6790423889DA@eris.apache.org> Author: brock Date: Wed Oct 26 13:35:33 2011 New Revision: 1189207 URL: http://svn.apache.org/viewvc?rev=1189207&view=rev Log: Merge 1189206 from trunk (MRUNIT-35: Include DISCLAIMER and BUILD in artifact Modified: incubator/mrunit/branches/mrunit-0.5.0/ (props changed) incubator/mrunit/branches/mrunit-0.5.0/src/main/assembly/dist.xml Propchange: incubator/mrunit/branches/mrunit-0.5.0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 26 13:35:33 2011 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/mapred/src/contrib/mrunit:713112 /hadoop/core/trunk/src/contrib/mrunit:776175-786373 -/incubator/mrunit/trunk:1189151 +/incubator/mrunit/trunk:1189151,1189206 Modified: incubator/mrunit/branches/mrunit-0.5.0/src/main/assembly/dist.xml URL: http://svn.apache.org/viewvc/incubator/mrunit/branches/mrunit-0.5.0/src/main/assembly/dist.xml?rev=1189207&r1=1189206&r2=1189207&view=diff ============================================================================== --- incubator/mrunit/branches/mrunit-0.5.0/src/main/assembly/dist.xml (original) +++ incubator/mrunit/branches/mrunit-0.5.0/src/main/assembly/dist.xml Wed Oct 26 13:35:33 2011 @@ -36,6 +36,8 @@ ${project.basedir} / + DISCLAIMER* + BUILD* README* LICENSE* NOTICE*