You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@guacamole.apache.org by vn...@apache.org on 2020/10/28 20:08:20 UTC

[guacamole-client] branch master updated (4374362 -> 3854da3)

This is an automated email from the ASF dual-hosted git repository.

vnick pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git.


    from 4374362  Merge 1.3.0 changes back to master.
     add f0c96c1  GUACAMOLE-1146: Take configured "totp-period" into account when generating tokens.
     add acf40b0  GUACAMOLE-1146: Merge take configured "totp-period" into account when generating tokens.
     new 3854da3  Merge 1.3.0 changes back to master.

The 1 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:
 .../org/apache/guacamole/auth/totp/user/UserVerificationService.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

[guacamole-client] 01/01: Merge 1.3.0 changes back to master.

Posted by vn...@apache.org.

This is an automated email from the ASF dual-hosted git repository.

vnick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git

commit 3854da30781ee11ffa5cff79d65790012d69f3a5
Merge: 4374362 acf40b0
Author: Virtually Nick <vn...@apache.org>
AuthorDate: Wed Oct 28 16:07:44 2020 -0400

    Merge 1.3.0 changes back to master.

 .../org/apache/guacamole/auth/totp/user/UserVerificationService.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)