HADOOP-8912. Merging changes 1397437 and 1397438 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1397439 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
3a9aadc3c7
commit
bc42561787
|
@ -0,0 +1,18 @@
|
||||||
|
# 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
|
||||||
|
*.csproj text merge=union eol=crlf
|
||||||
|
*.sln text merge=union eol=crlf
|
|
@ -44,6 +44,9 @@ Release 2.0.3-alpha - Unreleased
|
||||||
HADOOP-8911. CRLF characters in source and text files.
|
HADOOP-8911. CRLF characters in source and text files.
|
||||||
(Raja Aluri via suresh)
|
(Raja Aluri via suresh)
|
||||||
|
|
||||||
|
HADOOP-8912. Add .gitattributes file to prevent CRLF and LF mismatches
|
||||||
|
for source and text files. (Raja Aluri via suresh)
|
||||||
|
|
||||||
OPTIMIZATIONS
|
OPTIMIZATIONS
|
||||||
|
|
||||||
HADOOP-8866. SampleQuantiles#query is O(N^2) instead of O(N). (Andrew Wang
|
HADOOP-8866. SampleQuantiles#query is O(N^2) instead of O(N). (Andrew Wang
|
||||||
|
|
Loading…
Reference in New Issue