hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cnaur...@apache.org
Subject svn commit: r1531983 - in /hadoop/common/trunk: .gitattributes hadoop-tools/hadoop-streaming/src/test/bin/cat.cmd hadoop-tools/hadoop-streaming/src/test/bin/xargs_cat.cmd
Date Mon, 14 Oct 2013 17:13:39 GMT
Author: cnauroth
Date: Mon Oct 14 17:13:38 2013
New Revision: 1531983

URL: http://svn.apache.org/r1531983
Log:
HADOOP-10040. svn propset to native line endings on Windows files. Contributed by Chris Nauroth.

Modified:
    hadoop/common/trunk/.gitattributes
    hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/test/bin/cat.cmd   (props changed)
    hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/test/bin/xargs_cat.cmd   (props
changed)

Modified: hadoop/common/trunk/.gitattributes
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/.gitattributes?rev=1531983&r1=1531982&r2=1531983&view=diff
==============================================================================
--- hadoop/common/trunk/.gitattributes (original)
+++ hadoop/common/trunk/.gitattributes Mon Oct 14 17:13:38 2013
@@ -13,8 +13,8 @@
 
 *.sh     text eol=lf
 
-*.bat    binary
-*.cmd    binary
-*.vcxproj binary
-*.csproj binary
-*.sln    binary
+*.bat    text eol=crlf
+*.cmd    text eol=crlf
+*.vcxproj text merge=union eol=crlf
+*.csproj text merge=union eol=crlf
+*.sln    text merge=union eol=crlf

Propchange: hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/test/bin/cat.cmd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/test/bin/xargs_cat.cmd
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message