Port fixes from 4.0 branch

Graylog2 / documentation

Archived Graylog documentation. See https://docs.graylog.org/ for the new documentation.

http://archivedocs.graylog.org/

Other

146 stars 246 forks source link

Closed bernd closed 3 years ago

bernd commented 3 years ago

Please use "rebase and merge" instead of squash to preserve the history. Thanks!

[x] The commit history must be preserved - please use the rebase-merge or standard merge option instead of squash-merge
[ ] Sync up with the author before merging

danotorrey commented 3 years ago

FYI @bernd The Allow PR Merge Commits setting was disabled for this repository, so I enabled it and merged this PR with that option.

Was it intentional that only Squash commits where enabled?

From Settings: