Author: cnauroth Date: Fri Aug 9 00:11:34 2013 New Revision: 1512108 URL: http://svn.apache.org/r1512108 Log: HADOOP-9831. Merging change r1512105 from branch-2 to branch-2.1-beta.
Modified: hadoop/common/branches/branch-2.1-beta/.gitattributes Modified: hadoop/common/branches/branch-2.1-beta/.gitattributes URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/.gitattributes?rev=1512108&r1=1512107&r2=1512108&view=diff ============================================================================== --- hadoop/common/branches/branch-2.1-beta/.gitattributes (original) +++ hadoop/common/branches/branch-2.1-beta/.gitattributes Fri Aug 9 00:11:34 2013 @@ -14,5 +14,6 @@ *.sh text eol=lf *.bat text eol=crlf +*.cmd text eol=crlf *.csproj text merge=union eol=crlf *.sln text merge=union eol=crlf