Skip to content
This repository has been archived by the owner on May 24, 2023. It is now read-only.

Pass config directory to JvmOptionsParser #368

Merged
merged 1 commit into from
May 19, 2020
Merged

Pass config directory to JvmOptionsParser #368

merged 1 commit into from
May 19, 2020

Conversation

russcam
Copy link
Contributor

@russcam russcam commented May 18, 2020

Relates: elastic/elasticsearch#51882

With the introduction of jvm.options.d directory for customizing
jvm.options, the config directory path is now passed to jvm.options
parser tool instead of the jvm.options path. See the elasticsearch.bat
change for comparison:

https://github.com/elastic/elasticsearch/pull/51882/files#diff-6c06e8a0d0742dc053b8afcbfb2b4201R76

Fixes #363

Relates: elastic/elasticsearch#51882

With the introduction of jvm.options.d directory for customizing
jvm.options, the config directory path is now passed to jvm.options
parser tool instead of the jvm.options path. See the elasticsearch.bat
change for comparison:

https://github.com/elastic/elasticsearch/pull/51882/files#diff-6c06e8a0d0742dc053b8afcbfb2b4201R76

Fixes #363
@russcam russcam requested a review from a user May 18, 2020 12:46
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ghost
Copy link

ghost commented May 18, 2020

Thanks for looking at it @russcam ! Was on my list today, still very appreciated!

@reighnman
Copy link
Contributor

Thanks for this, went to do my upgrade today and ran into this issue.

@russcam russcam merged commit 31f27ce into master May 19, 2020
russcam added a commit that referenced this pull request May 19, 2020
Relates: elastic/elasticsearch#51882

With the introduction of jvm.options.d directory for customizing
jvm.options, the config directory path is now passed to jvm.options
parser tool instead of the jvm.options path. See the elasticsearch.bat
change for comparison:

https://github.com/elastic/elasticsearch/pull/51882/files#diff-6c06e8a0d0742dc053b8afcbfb2b4201R76

Fixes #363

(cherry picked from commit 31f27ce)
russcam added a commit that referenced this pull request May 19, 2020
Relates: elastic/elasticsearch#51882

With the introduction of jvm.options.d directory for customizing
jvm.options, the config directory path is now passed to jvm.options
parser tool instead of the jvm.options path. See the elasticsearch.bat
change for comparison:

https://github.com/elastic/elasticsearch/pull/51882/files#diff-6c06e8a0d0742dc053b8afcbfb2b4201R76

Fixes #363

(cherry picked from commit 31f27ce)
russcam added a commit that referenced this pull request May 19, 2020
Relates: elastic/elasticsearch#51882

With the introduction of jvm.options.d directory for customizing
jvm.options, the config directory path is now passed to jvm.options
parser tool instead of the jvm.options path. See the elasticsearch.bat
change for comparison:

https://github.com/elastic/elasticsearch/pull/51882/files#diff-6c06e8a0d0742dc053b8afcbfb2b4201R76

Fixes #363

(cherry picked from commit 31f27ce)
@russcam russcam deleted the fix/363 branch May 19, 2020 06:30
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Windows setup fails on upgrading to 7.7.0
2 participants