zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mic...@apache.org
Subject svn commit: r1584502 - in /zookeeper/branches/branch-3.4: .gitattributes CHANGES.txt
Date Fri, 04 Apr 2014 01:34:58 GMT
Author: michim
Date: Fri Apr  4 01:34:58 2014
New Revision: 1584502

URL: http://svn.apache.org/r1584502
Log:
ZOOKEEPER-1575. adding .gitattributes to prevent CRLF and LF mismatches for source and text
files (Raja Aluri via michim)

Added:
    zookeeper/branches/branch-3.4/.gitattributes
Modified:
    zookeeper/branches/branch-3.4/CHANGES.txt

Added: zookeeper/branches/branch-3.4/.gitattributes
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/.gitattributes?rev=1584502&view=auto
==============================================================================
--- zookeeper/branches/branch-3.4/.gitattributes (added)
+++ zookeeper/branches/branch-3.4/.gitattributes Fri Apr  4 01:34:58 2014
@@ -0,0 +1,19 @@
+# Auto detect text files and perform LF normalization
+*        text=auto
+
+*.cs     text diff=csharp
+*.java   text diff=java
+*.html   text diff=html
+*.py     text diff=python
+*.pl     text diff=perl
+*.pm     text diff=perl
+*.css    text
+*.js     text
+*.sql    text
+
+*.sh     text eol=lf
+
+*.bat    text eol=crlf
+*.cmd    text eol=crlf
+*.csproj text merge=union eol=crlf
+*.sln    text merge=union eol=crlf

Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1584502&r1=1584501&r2=1584502&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Fri Apr  4 01:34:58 2014
@@ -16,6 +16,11 @@ BUGFIXES:
 
   ZOOKEEPER-1897. ZK Shell/Cli not processing commands (stack via michim)
 
+IMPROVEMENTS:
+
+  ZOOKEEPER-1575. adding .gitattributes to prevent CRLF and LF mismatches for
+  source and text files (Raja Aluri via michim)
+
 
 Release 3.4.6 - 2014-03-10 
 



Mime
View raw message