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

Merge master to v5, bump vsn #4801

Merged
merged 27 commits into from
May 13, 2021
Merged

Merge master to v5, bump vsn #4801

merged 27 commits into from
May 13, 2021

Conversation

6293
Copy link
Contributor

@6293 6293 commented May 13, 2021

Fixes

If your build fails due to your commit message not passing the build checks, please review the guidelines here: https://github.com/emqx/emqx/blob/master/CONTRIBUTING.md.

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:

  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been added / updated (for bug fixes / features)
  • In case of non-backward compatible changes, reviewer should check this item as a write-off, and add details in Backward Compatibility section

Backward Compatibility

More information

zmstone and others added 26 commits May 7, 2021 22:40
previsouly zip was built before pkg (as makefile dependency)
since pkg's only depend on rebar3 release tarball (not .zip)
makefile was updated but forgot to update the pkg build for macos
Prioro to this change, ekka lib dir was added by inspecting
the ekka lib version in persisted RELEASES file.
However, this file may not be the true version if a hot
upgrade failed in the middle.
In this fix, it reads the per-version emqx.rel file
content to load lib paths.
when using `manual`, all nodes in the cluster should agree
to the same port number, so there is no need to make peer
port number for clients.
The metrics for messages.* shows the number of times such messages are
received, and it should be a counter rather than a gauge type.
There are three indictors about delayed module:
- 'messages.delayed': shows the number of delayed msg received
- 'emqx_delayed_count': shows the delayed table size now
- 'emqx_delayed_max': shows the maximum size that the delayed table has reached
@6293 6293 force-pushed the merge-master-to-v5 branch 3 times, most recently from 89f9f3f to 3d4f060 Compare May 13, 2021 16:22
@6293 6293 marked this pull request as ready for review May 13, 2021 16:37
@6293 6293 requested a review from a team May 13, 2021 16:37
@6293 6293 changed the title Merge master to v5, bump vsn, skip relup test in dev/v5.0 Merge master to v5, bump vsn May 13, 2021
@6293 6293 merged commit 0a01023 into emqx:dev/v5.0 May 13, 2021
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.

6 participants