[ https://issues.apache.org/jira/browse/ARTEMIS-3638?focusedWorklogId=711490&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-711490 ]
ASF GitHub Bot logged work on ARTEMIS-3638: ------------------------------------------- Author: ASF GitHub Bot Created on: 19/Jan/22 16:44 Start Date: 19/Jan/22 16:44 Worklog Time Spent: 10m Work Description: gtully commented on pull request #3907: URL: https://github.com/apache/activemq-artemis/pull/3907#issuecomment-1016656322 @jbertram looking to resolve the merge conflict via the gh ui, seems not to have the desired effect. sorry! Maybe you do a rebase and resolve against main and force push from your local branch and whack my merge from main. I won't attempt that again any time soon :-) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: gitbox-unsubscr...@activemq.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking ------------------- Worklog Id: (was: 711490) Time Spent: 20m (was: 10m) > Support MQTT 5 > -------------- > > Key: ARTEMIS-3638 > URL: https://issues.apache.org/jira/browse/ARTEMIS-3638 > Project: ActiveMQ Artemis > Issue Type: New Feature > Reporter: Justin Bertram > Assignee: Justin Bertram > Priority: Major > Time Spent: 20m > Remaining Estimate: 0h > -- This message was sent by Atlassian Jira (v8.20.1#820001)