Skip to content
This repository has been archived by the owner on Feb 3, 2021. It is now read-only.

Fix gitattributes for jar files #548

Merged
merged 2 commits into from
May 9, 2018
Merged

Conversation

emlyn
Copy link
Contributor

@emlyn emlyn commented May 9, 2018

#470 breaks git on OSX:

> git diff
warning: CRLF will be replaced by LF in aztk_cli/config/jars/azure-data-lake-store-sdk-2.0.11.jar.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in aztk_cli/config/jars/azure-storage-2.0.0.jar.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in aztk_cli/config/jars/hadoop-azure-2.7.3.jar.
The file will have its original line endings in your working directory.
diff --git a/aztk_cli/config/jars/azure-data-lake-store-sdk-2.0.11.jar b/aztk_cli/config/jars/azure-data-lake-store-sdk-2.0.11.jar
index 6c3936c..87bd6c2 100644
Binary files a/aztk_cli/config/jars/azure-data-lake-store-sdk-2.0.11.jar and b/aztk_cli/config/jars/azure-data-lake-store-sdk-2.0.11.jar differ
diff --git a/aztk_cli/config/jars/azure-storage-2.0.0.jar b/aztk_cli/config/jars/azure-storage-2.0.0.jar
index 123d030..bc6d025 100644
Binary files a/aztk_cli/config/jars/azure-storage-2.0.0.jar and b/aztk_cli/config/jars/azure-storage-2.0.0.jar differ
diff --git a/aztk_cli/config/jars/hadoop-azure-2.7.3.jar b/aztk_cli/config/jars/hadoop-azure-2.7.3.jar
index 36c04f5..ef90e2a 100644
Binary files a/aztk_cli/config/jars/hadoop-azure-2.7.3.jar and b/aztk_cli/config/jars/hadoop-azure-2.7.3.jar differ

Copy link
Member

@timotheeguerin timotheeguerin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll approve to handle the case where new jar being added. As those were removed recently from the repository

@timotheeguerin
Copy link
Member

There is actually other files I noticed printed that message even though they shouldn't be.
We could maybe add more extensions to the list of binary. One I am thinking of is png

@emlyn
Copy link
Contributor Author

emlyn commented May 9, 2018

Good point. I've added .png, and also found a couple of others (.avro and .parquet) that I added too.

@timotheeguerin timotheeguerin merged commit a18660b into Azure:master May 9, 2018
@emlyn emlyn deleted the attributes branch May 9, 2018 23:02
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants