Made Git normalize all line endings automatically. Instead of relying on the user to `core.autocrlf = true` before cloning, we now set this in `.gitattributes` for all files.
Only one file needed normalization via `git add --renormalize .`, it was `site/doap.rdf`. The Windows instructions were updated to remove the note about setting autocrlf globally, as it is no longer necessary, and could conflict with user desired settings. Review: https://reviews.apache.org/r/67730/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/01475ec2 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/01475ec2 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/01475ec2 Branch: refs/heads/master Commit: 01475ec287e34f6077bbef1299fda0619872feea Parents: 5076bab Author: Andrew Schwartzmeyer <and...@schwartzmeyer.com> Authored: Mon Jun 25 12:02:40 2018 -0700 Committer: Andrew Schwartzmeyer <and...@schwartzmeyer.com> Committed: Wed Jul 11 11:30:14 2018 -0700 ---------------------------------------------------------------------- .gitattributes | 5 +++++ docs/windows.md | 6 ------ site/doap.rdf | 10 +++++----- 3 files changed, 10 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/01475ec2/.gitattributes ---------------------------------------------------------------------- diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..c05b4ff --- /dev/null +++ b/.gitattributes @@ -0,0 +1,5 @@ +# Set `core.autocrlf = true` for this repo. +* text=auto + +# Treat patch files as text. +*.patch text http://git-wip-us.apache.org/repos/asf/mesos/blob/01475ec2/docs/windows.md ---------------------------------------------------------------------- diff --git a/docs/windows.md b/docs/windows.md index 86b9fe3..1e4deaf 100644 --- a/docs/windows.md +++ b/docs/windows.md @@ -21,12 +21,6 @@ Mesos 1.0.0 introduced experimental support for Windows. 3. Install [GNU patch for Windows](http://gnuwin32.sourceforge.net/packages/patch.htm). 4. If building from source, install [Git](https://git-scm.com/download/win). - During installation, keep the defaults to "Use Git from the Windows - Command Prompt", and "Checkout Windows-style, commit Unix-style - line endings" (i.e. `git config --global core.autocrlf true`). The - last part is _very_ important, because GNU patch will crash with - "Assertion failed, hunk, file patch.c, line 343" if the patch files - on Windows are Unix-style (LF) instead of Windows-style (CRLF). 5. Make sure there are no spaces in your build directory. For example, `C:/Program Files (x86)/mesos` is an invalid build directory. http://git-wip-us.apache.org/repos/asf/mesos/blob/01475ec2/site/doap.rdf ---------------------------------------------------------------------- diff --git a/site/doap.rdf b/site/doap.rdf index e85ff0e..d77e48a 100644 --- a/site/doap.rdf +++ b/site/doap.rdf @@ -27,12 +27,12 @@ <name>Apache Mesos</name> <homepage rdf:resource="http://mesos.apache.org"; /> <asfext:pmc rdf:resource="http://mesos.apache.org"; /> - <shortdesc>Apache Mesos is a cluster manager that provides efficient resource isolation + <shortdesc>Apache Mesos is a cluster manager that provides efficient resource isolation and sharing across distributed applications, or frameworks.</shortdesc> - <description>Apache Mesos is a cluster manager that provides efficient resource isolation -and sharing across distributed applications, or frameworks. It can run Hadoop, -MPI, Hypertable, Spark, and other frameworks on a dynamically shared pool of -nodes. + <description>Apache Mesos is a cluster manager that provides efficient resource isolation +and sharing across distributed applications, or frameworks. It can run Hadoop, +MPI, Hypertable, Spark, and other frameworks on a dynamically shared pool of +nodes. </description> <bug-database rdf:resource="https://issues.apache.org/jira/browse/MESOS"; /> <mailing-list rdf:resource="http://mesos.apache.org/community/"; />
