Return-Path: 
 <commits-return-94585-apmail-cassandra-commits-archive=cassandra.apache.org@cassandra.apache.org>
X-Original-To: apmail-cassandra-commits-archive@www.apache.org
Delivered-To: apmail-cassandra-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 5B1A7CD26
	for <apmail-cassandra-commits-archive@www.apache.org>;
 Mon, 17 Mar 2014 16:37:33 +0000 (UTC)
Received: (qmail 88315 invoked by uid 500); 17 Mar 2014 16:37:32 -0000
Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org
Received: (qmail 87777 invoked by uid 500); 17 Mar 2014 16:37:26 -0000
Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cassandra.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cassandra.apache.org>
List-Post: <mailto:commits@cassandra.apache.org>
List-Id: <commits.cassandra.apache.org>
Reply-To: dev@cassandra.apache.org
Delivered-To: mailing list commits@cassandra.apache.org
Received: (qmail 87510 invoked by uid 99); 17 Mar 2014 16:37:21 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Mar 2014 16:37:21 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 5C46E982648; Mon, 17 Mar 2014 16:37:21 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: jbellis@apache.org
To: commits@cassandra.apache.org
Date: Mon, 17 Mar 2014 16:37:21 -0000
Message-Id: <78adbe4dca0143d891c0c5867c150c15@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/3] git commit: fix CRLF in bash scripts when building on Windows
 patch by Peter; reviewed by Joshua McKenzie for CASSANDRA-6798

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 60882c15c -> dd60ab474
  refs/heads/trunk 3d017f08f -> c3d9280e4


fix CRLF in bash scripts when building on Windows
patch by Peter; reviewed by Joshua McKenzie for CASSANDRA-6798


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dd60ab47
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd60ab47
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd60ab47

Branch: refs/heads/cassandra-2.1
Commit: dd60ab474053ebd4cc38ed857df355293ae2c491
Parents: 60882c1
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Mon Mar 17 11:37:10 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Mon Mar 17 11:37:10 2014 -0500

----------------------------------------------------------------------
 build.xml | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd60ab47/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index a938b25..83ce003 100644
--- a/build.xml
+++ b/build.xml
@@ -886,6 +886,10 @@
     <target name="artifacts" depends="jar,javadoc"
             description="Create Cassandra release artifacts">
       <mkdir dir="${dist.dir}"/>
+      <!-- fix the control linefeed so that builds on windows works on linux -->
+      <fixcrlf srcdir="bin" includes="**/*" excludes="**/*.bat" eol="lf" eof="remove" />
+      <fixcrlf srcdir="conf" includes="**/*" excludes="**/*.bat" eol="lf" eof="remove" />
+      <fixcrlf srcdir="tools/bin" includes="**/*" excludes="**/*.bat" eol="lf" eof="remove" />
       <copy todir="${dist.dir}/lib">
         <fileset dir="${build.lib}"/>
         <fileset dir="${build.dir}">