You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2024/03/14 07:28:17 UTC
(guacamole-client) branch main updated (5a43d494f -> 3611be5c4)
This is an automated email from the ASF dual-hosted git repository.
mjumper pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
from 5a43d494f Merge patch changes back to main.
add 056342503 GUACAMOLE-1905: Restore license info for woodstox-stax2-api 4.2.0, now in use again after version revert.
add 6119c85d0 GUACAMOLE-1905: Merge correction to license information for Woodstox.
new 1a51fc44b Merge 1.5.5 changes back to patch.
new 3611be5c4 Merge changes from patch branch back to main.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
doc/licenses/woodstox-stax2-api-4.2.1/dep-coordinates.txt | 1 -
.../{woodstox-stax2-api-4.2.1 => woodstox-stax2-api-4.2}/LICENSE | 0
.../{woodstox-stax2-api-4.2.1 => woodstox-stax2-api-4.2}/README | 4 ++--
doc/licenses/woodstox-stax2-api-4.2/dep-coordinates.txt | 1 +
4 files changed, 3 insertions(+), 3 deletions(-)
delete mode 100644 doc/licenses/woodstox-stax2-api-4.2.1/dep-coordinates.txt
rename doc/licenses/{woodstox-stax2-api-4.2.1 => woodstox-stax2-api-4.2}/LICENSE (100%)
rename doc/licenses/{woodstox-stax2-api-4.2.1 => woodstox-stax2-api-4.2}/README (69%)
create mode 100644 doc/licenses/woodstox-stax2-api-4.2/dep-coordinates.txt
(guacamole-client) 02/02: Merge changes from patch branch back to main.
Posted by mj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mjumper pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 3611be5c41b5c08d2dc224ff197274112eea0302
Merge: 5a43d494f 1a51fc44b
Author: Michael Jumper <mj...@apache.org>
AuthorDate: Thu Mar 14 00:28:19 2024 -0700
Merge changes from patch branch back to main.
doc/licenses/woodstox-stax2-api-4.2.1/dep-coordinates.txt | 1 -
.../{woodstox-stax2-api-4.2.1 => woodstox-stax2-api-4.2}/LICENSE | 0
.../{woodstox-stax2-api-4.2.1 => woodstox-stax2-api-4.2}/README | 4 ++--
doc/licenses/woodstox-stax2-api-4.2/dep-coordinates.txt | 1 +
4 files changed, 3 insertions(+), 3 deletions(-)
(guacamole-client) 01/02: Merge 1.5.5 changes back to patch.
Posted by mj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mjumper pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 1a51fc44b4f543af8aff6c4c2ff9a7633ee3f2fa
Merge: 4f8848d84 6119c85d0
Author: Michael Jumper <mj...@apache.org>
AuthorDate: Thu Mar 14 00:27:48 2024 -0700
Merge 1.5.5 changes back to patch.
doc/licenses/woodstox-stax2-api-4.2.1/dep-coordinates.txt | 1 -
.../{woodstox-stax2-api-4.2.1 => woodstox-stax2-api-4.2}/LICENSE | 0
.../{woodstox-stax2-api-4.2.1 => woodstox-stax2-api-4.2}/README | 4 ++--
doc/licenses/woodstox-stax2-api-4.2/dep-coordinates.txt | 1 +
4 files changed, 3 insertions(+), 3 deletions(-)