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

chore: update config's changelog and emqx_conf.template #10426

Merged
merged 8 commits into from Apr 18, 2023

Conversation

zhongwencool
Copy link
Member

@zhongwencool zhongwencool commented Apr 18, 2023

Fixes EMQX-9302

Related docs changes: emqx/emqx-docs#1811

Summary

🤖 Generated by Copilot at d9f97a9

This pull request simplifies and updates the configuration system for EMQX CE. It renames the cluster override configuration files to cluster.hocon, deprecates the local-override.conf file, and changes the order of priority for configuration settings. It also fixes and improves the documentation for the configuration template files in English and Chinese.

PR Checklist

Please convert it to a draft if any of the following conditions are not met. Reviewers may skip over until all the items are checked:

  • Added tests for the changes
  • Changed lines covered in coverage report
  • Change log has been added to changes/{ce,ee}/(feat|perf|fix)-<PR-id>.en.md files
  • For internal contributor: there is a jira ticket to track this change
  • If there should be document changes, a PR to emqx-docs.git is sent, or a jira ticket is created to follow up
  • Schema changes are backward compatible

Checklist for CI (.github/workflows) changes

  • If changed package build workflow, pass this action (manual trigger)
  • Change log has been added to changes/ dir for user-facing artifacts update

lafirest
lafirest previously approved these changes Apr 18, 2023
zhongwencool and others added 3 commits April 18, 2023 21:07
Co-authored-by: Zaiming (Stone) Shi <zmstone@gmail.com>
Co-authored-by: Zaiming (Stone) Shi <zmstone@gmail.com>
@HJianBo HJianBo merged commit 46bbcf9 into emqx:master Apr 18, 2023
111 checks passed
Comment on lines +1 to +2
Optimize the configuration priority mechanism to fix the issue where the configuration
changes made to `etc/emqx.conf` do not take effect after restarting EMQX.
Copy link
Member

Choose a reason for hiding this comment

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

I cant seem to relates this to the diff.

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.

None yet

4 participants