@mwithheld opened this Pull Request on August 3rd 2021 Contributor

Description:

This is a further fix to #17764, fixing the Monolog:SyslogHandler create() call to use its constructor-default facility rather than manually setting it to 'syslog' incorrectly.

@diosmosis commented on August 3rd 2021 Member

@mwithheld I think you'll need to merge these changes w/ 4.x-dev to remove the conflicts, something like:

git checkout 4.x-dev
git pull upstream 4.x-dev # upstream should be the matomo-org/matomo repo
git checkout patch-2
git merge 4.x-dev
@diosmosis commented on August 5th 2021 Member

@mwithheld left a couple suggestions, after those I should be able to merge it.

@github-actions[bot] commented on August 17th 2021 Contributor

This issue is in "needs review" but there has been no activity for 7 days. ping @matomo-org/core-reviewers

@diosmosis commented on August 17th 2021 Member

Hi @mwithheld, sorry for the late reply, it seems like you added some commits for another PR into this one (the one dealing w/ NotSupportedBrowserException).

@mwithheld commented on August 24th 2021 Contributor

Good catch - I've reset the branch to before the incorrect ones, force-pushed the branch, and merged updates from the 4.x-dev branch. Hopefully that is clean now.

@diosmosis commented on August 24th 2021 Member

Thanks for fixing up the PR @mwithheld! It's now merged.

This Pull Request was closed on August 24th 2021
Powered by GitHub Issue Mirror