Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix line endings #703

Merged
merged 2 commits into from
Nov 19, 2015
Merged

Fix line endings #703

merged 2 commits into from
Nov 19, 2015

Conversation

karyon
Copy link
Contributor

@karyon karyon commented Nov 6, 2015

See puppetlabs/puppetlabs-concat#80 for an explanation.

i had no issues with the .rb file, but added it as well because i guessed all shebang lines are probably broken with windows line endings.

it should also be possible to just add the files with shebang lines to the gitattributes file instead of those very inclusive filters, if you prefer that.

@igalic
Copy link
Contributor

igalic commented Nov 7, 2015

this is something i'd rather see in modulesync_configs

@karyon
Copy link
Contributor Author

karyon commented Nov 8, 2015

actually, i have a similar PR open in concat: puppetlabs/puppetlabs-concat#373, so... yeah.

should i open a PR there with exactly the same changes?

@igalic
Copy link
Contributor

igalic commented Nov 8, 2015

yes, please.

@bmjen
Copy link
Contributor

bmjen commented Nov 18, 2015

Going to close this in lieu of doing with this modulesync PR.

puppetlabs/modulesync_configs#39

@bmjen bmjen closed this Nov 18, 2015
@bmjen bmjen reopened this Nov 18, 2015
@bmjen
Copy link
Contributor

bmjen commented Nov 19, 2015

Changed my mind. Probably don't want to wait for us to modulesync this.

bmjen added a commit that referenced this pull request Nov 19, 2015
@bmjen bmjen merged commit 44b420a into puppetlabs:master Nov 19, 2015
@karyon karyon deleted the fix_line_endings branch November 19, 2015 07:48
@karyon karyon restored the fix_line_endings branch November 19, 2015 07:49
@karyon karyon deleted the fix_line_endings branch November 20, 2015 17:58
@karyon karyon restored the fix_line_endings branch November 20, 2015 17:58
cegeka-jenkins pushed a commit to cegeka/puppet-postgresql that referenced this pull request Oct 23, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants