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

Fix es5 issues #206

Merged
merged 3 commits into from Dec 7, 2016
Merged

Fix es5 issues #206

merged 3 commits into from Dec 7, 2016

Conversation

veger
Copy link
Contributor

@veger veger commented Dec 5, 2016

As requested in #182 a PR for the 5.x branch.

Copied description from #182:

In order to be able to install a Elasticsearch cluster using version 5.0.0, I had to add the following v5.x support (next to the other PRs I submitted today and yesterday):

⚠️ I am absolutely no Elasticsearch expert (or a experiences user), so I added my references to the list of changes to show why I made the modifications

Additional remarks:

  • I tried to keep ES < 5.x compatible, hence the version checks. If support for < 5.x is not required, I can remove the checks
  • I do not know about (the/Ansible) role tests, so they probably break... I would appreciate it, if someone is willing to help, or point me in the right direction!

* Use log4j2.properties instead of logging.yml
* Add jvm.options
* Use bootstrap.memory_lock instead of bootstrap.mlockall
* Get rid of work directory
* Executable does not accept `-D` anymore, replace with `-E` and `-p`
* Get rid of 5.x default (file)s
ES_HEAP_SIZE is not used for ES5.x anymore, instead ES_JAVA_OPTS 'Xms' and 'Xmx' are used
@elasticmachine
Copy link
Collaborator

Jenkins standing by to test this. If you aren't a maintainer, you can ignore this comment. Someone with commit access, please review this and clear it for Jenkins to run.

@jakommo
Copy link
Contributor

jakommo commented Dec 6, 2016

Jenkins, test it!

@jakommo jakommo merged commit 2a27c76 into elastic:5.x Dec 7, 2016
@jakommo
Copy link
Contributor

jakommo commented Dec 7, 2016

merged, thanks for your contribution @veger, much appreciated.

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.

None yet

3 participants