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

Included config files relative to sys.config directory #1838

Merged
merged 1 commit into from
Jun 15, 2018

Conversation

crownedgrouse
Copy link
Contributor

@crownedgrouse crownedgrouse commented Jun 13, 2018

Included config files relative to sys.config dir

Change the way included config files are searched in sys.config.
Search first relative to sys.config directory, then relative
to current working directory, for backward compatibility.

This permit same result when using a sys.config file in a release
or starting manually a node with -config.

Credit to Siri Hansen for test case.

@sirihansen
Copy link
Contributor

Great, looks good, but I'm missing two diffs in application_SUITE.erl: the new test case function must be exported and also included in the list returned from function all/0.

@sirihansen sirihansen self-assigned this Jun 14, 2018
@crownedgrouse
Copy link
Contributor Author

hum you are right, I will fix ASAP.

@sirihansen
Copy link
Contributor

I need to include this today, so if you can make it within an hour or so, it would be good. Else, I can push a fixup today, so you can only squash it tomorrow. What's easiest/possible for you?

@crownedgrouse
Copy link
Contributor Author

I m not able to do this before end of day. I'm far from home; can you please do it; sorry for that.

@crownedgrouse
Copy link
Contributor Author

I will squash it tonigh

@sirihansen
Copy link
Contributor

Great! When you squash, please also edit the commit message according to this guideline. In particular, please follow the three bullets under "DO". Thanks again!

Change the way included config files are searched in sys.config.
Search first relative to sys.config directory, then relative
to current working directory, for backward compatibility.

This permit same result when using a sys.config file in a release
or starting manually a node with -config.

Credit to Siri Hansen for test case.
@crownedgrouse
Copy link
Contributor Author

squashed and commit message rewritten according guideline (hopefully). Thanks for the co-working !

@sirihansen sirihansen merged commit a939b26 into erlang:master Jun 15, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants