You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@eagle.apache.org by haoch <gi...@git.apache.org> on 2016/10/18 09:52:36 UTC
[GitHub] incubator-eagle pull request #526: [MINOR] Fix end of line conflict caused b...
GitHub user haoch opened a pull request:
https://github.com/apache/incubator-eagle/pull/526
[MINOR] Fix end of line conflict caused by .gitattributes
<!--
{% comment %}
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to you under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
{% endcomment %}
-->
Be sure to do all of the following to help us incorporate your contribution
quickly and easily:
- [ ] Make sure the PR title is formatted like:
`[EAGLE-<Jira issue #>] Description of pull request`
- [ ] Make sure tests pass via `mvn clean verify`. (Even better, enable
Travis-CI on your fork and ensure the whole test matrix passes).
- [ ] Replace `<Jira issue #>` in the title with the actual Jira issue
number, if there is one.
- [ ] If this contribution is large, please file an Apache
[Individual Contributor License Agreement](https://www.apache.org/licenses/icla.txt).
---
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/haoch/incubator-eagle FixEOL
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-eagle/pull/526.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #526
----
commit 2479d32791dd1a424af7513279ba28543baf6af4
Author: wujinhu <wu...@126.com>
Date: 2016-10-18T09:20:37Z
[EAGLE-633] MR history feeder read some configurations from eagle server
Author: wujinhu <wu...@126.com>
Closes #525 from wujinhu/EAGLE-633.
commit a4cd8248f11226538fad217d265ac1a0b5bd8190
Author: Hao Chen <ha...@apache.org>
Date: 2016-10-18T09:46:44Z
[MINOR] Fix CRLF to LF as default eol
commit b8d41cdc2cc8ee8e601ab3147d2339fe6e70dade
Author: Hao Chen <ha...@apache.org>
Date: 2016-10-18T09:50:49Z
Merge conflict
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-eagle pull request #526: [MINOR] Fix end of line conflict caused b...
Posted by haoch <gi...@git.apache.org>.
Github user haoch closed the pull request at:
https://github.com/apache/incubator-eagle/pull/526
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---