[
https://issues.apache.org/jira/browse/ZOOKEEPER-1943?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14037685#comment-14037685
]
Hongchao Deng commented on ZOOKEEPER-1943:
------------------------------------------
[~phunt] They are not the same. The version in the trunk has the author's
license. I am not sure whether I should put this in branch-3.4.
I think so far this will fix the incompatibility with ".gitattributes".
> "src/contrib/zooinspector/NOTICE.txt" isn't complying to ".gitattributes" in
> branch-3.4
> ---------------------------------------------------------------------------------------
>
> Key: ZOOKEEPER-1943
> URL: https://issues.apache.org/jira/browse/ZOOKEEPER-1943
> Project: ZooKeeper
> Issue Type: Bug
> Components: contrib
> Affects Versions: 3.4.6
> Reporter: Hongchao Deng
> Assignee: Hongchao Deng
> Fix For: 3.4.7
>
> Attachments: ZOOKEEPER-1943-branch34.patch
>
>
> Using the git repo and checkout "branch-3.4", the
> "src/contrib/zooinspector/NOTICE.txt" file always shows up for changes but
> cannot be checkout or reset.
> This is caused by ".gitattributes" line "text=auto" where git automatically
> sets the line ending stuff.
> To solve this, I am gonna commit the git auto change and submit it as a patch
> for "branch-3.4".
--
This message was sent by Atlassian JIRA
(v6.2#6252)
