[guacamole-client] branch staging/1.2.0 updated (745a1a4 -> a2c8f46)

[mj...@apache.org]

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

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


    from 745a1a4  GUACAMOLE-678: Merge correction to URIGuacamoleProperty handling of null values.
     add 54cd540  GUACAMOLE-103: Adjust checks for entity ID and ACS URL properties.
     new a2c8f46  GUACAMOLE-103: Re-merge usability improvements to handling of SAML entity ID property.

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:
 .../auth/saml/conf/ConfigurationService.java          | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

[guacamole-client] 01/01: GUACAMOLE-103: Re-merge usability improvements to handling of SAML entity ID property.

[mj...@apache.org]

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

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

commit a2c8f461bee884a6c81a6e6ea1a017bf5a894e74
Merge: 745a1a4 54cd540
Author: Mike Jumper <mj...@apache.org>
AuthorDate: Wed Jun 24 18:01:41 2020 -0700

    GUACAMOLE-103: Re-merge usability improvements to handling of SAML entity ID property.
    
    The improvements from commit ed7e7bbb84af06433c54f4a58208251ff2772485 were supposed to go to `staging/1.2.0` and then get merged back to `master`, not directly to `master`. The same changes are now being redone against `staging/1.2.0` (to be merged back in again) so that things can be put back in proper sync.

 .../auth/saml/conf/ConfigurationService.java          | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)