You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@guacamole.apache.org by "mike-jumper (via GitHub)" <gi...@apache.org> on 2023/03/15 18:09:24 UTC
[GitHub] [guacamole-client] mike-jumper opened a new pull request, #810: GUACAMOLE-1738: Update version of MySQL connector
mike-jumper opened a new pull request, #810:
URL: https://github.com/apache/guacamole-client/pull/810
This is an exact copy of #802, cherry-picked onto `staging/1.5.1`.
Testing a merge of this to `staging/1.5.1`, and then `staging/1.5.1` back to `master`, git seems happy and is able to handle the merges without conflicts.
--
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: dev-unsubscribe@guacamole.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] necouchman commented on pull request #810: GUACAMOLE-1738: Update version of MySQL connector
Posted by "necouchman (via GitHub)" <gi...@apache.org>.
necouchman commented on PR #810:
URL: https://github.com/apache/guacamole-client/pull/810#issuecomment-1471790908
@mike-jumper Nevermind, re-read your original comment and went ahead and pushed to master. We do end up with two sets of GUACAMOLE-1738 commits in the master branch, but the code is fine.
In the future, especially right after a release, we'll just have to make sure to get the bugfix branch created very early so we can push to that.
--
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: dev-unsubscribe@guacamole.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] necouchman commented on pull request #810: GUACAMOLE-1738: Update version of MySQL connector
Posted by "necouchman (via GitHub)" <gi...@apache.org>.
necouchman commented on PR #810:
URL: https://github.com/apache/guacamole-client/pull/810#issuecomment-1470619625
@mike-jumper So, do I need to go through the same process of doing the "Merging 1.5.1 changes back to master"? It looks like it works fine, we just end up with duplicate commits...
--
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: dev-unsubscribe@guacamole.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] necouchman merged pull request #810: GUACAMOLE-1738: Update version of MySQL connector
Posted by "necouchman (via GitHub)" <gi...@apache.org>.
necouchman merged PR #810:
URL: https://github.com/apache/guacamole-client/pull/810
--
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: dev-unsubscribe@guacamole.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org