Return-Path: X-Original-To: apmail-zookeeper-commits-archive@www.apache.org Delivered-To: apmail-zookeeper-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 621DF11C7A for ; Fri, 4 Apr 2014 01:35:22 +0000 (UTC) Received: (qmail 99442 invoked by uid 500); 4 Apr 2014 01:35:22 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 99331 invoked by uid 500); 4 Apr 2014 01:35:21 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 99272 invoked by uid 99); 4 Apr 2014 01:35:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Apr 2014 01:35:20 +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; Fri, 04 Apr 2014 01:35:19 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EE2C92388993; Fri, 4 Apr 2014 01:34:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1584502 - in /zookeeper/branches/branch-3.4: .gitattributes CHANGES.txt Date: Fri, 04 Apr 2014 01:34:58 -0000 To: commits@zookeeper.apache.org From: michim@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140404013458.EE2C92388993@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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