branch-3.4 -- bugfix -- ZOOKEEPER-2890

.gitattributes

@@ -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

.gitignore

@@ -0,0 +1,82 @@
+# Java
+hs_err_pid*
+
+# Git
+*.orij
+*.rej
+
+# SVN
+.svn
+.revision
+
+# Eclipse
+.metadata
+.classpath
+.eclipse/
+.idea/
+.project
+.revision/
+.settings/
+.externalToolBuilders/
+local.properties
+.recommenders
+*.launch
+build/
+target/
+out/
+
+# Intellij
+*.ipr
+*.iws
+*.iml
+
+# NetBeans
+*~.nib
+nbbuild/
+dist/
+nbdist/
+.ndb-gradle/
+.cproject
+.buildpath
+
+# Other
+*~
+logs/
+*.out
+*.log
+*.bak
+*.tmp
+tmp/**
+tmp/**/*
+.DS_Store
+.gradle
+*.patch
+*.swp
+generated
+
+# C
+tags
+.cproject
+.project
+obj
+src/c/core.*
+src/c/TEST-*.txt
+src/c/*.la
+src/c/*.lo
+src/c/*.o
+src/c/generated/
+src/java/generated/
+src/java/lib/ant-eclipse-*
+src/java/lib/ivy-*
+src/c/Makefile.in
+src/c/aclocal.m4
+src/c/autom4te.cache/
+src/c/compile
+src/c/config.guess
+src/c/config.h.in
+src/c/config.sub
+src/c/configure
+src/c/depcomp
+src/c/install-sh
+src/c/ltmain.sh
+src/c/missing