Merge 1.0.0 changes back to master.

Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/caf07a92
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/caf07a92
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/caf07a92

Branch: refs/heads/master
Commit: caf07a92a90bf38140f842438903c317a683c99a
Parents: fc457c0 801a5df
Author: Michael Jumper <mjum...@apache.org>
Authored: Wed Dec 5 14:40:34 2018 -0800
Committer: Michael Jumper <mjum...@apache.org>
Committed: Wed Dec 5 14:40:34 2018 -0800

----------------------------------------------------------------------
 .../auth/cas/AuthenticationProviderService.java         | 12 ++----------
 .../guacamole/auth/cas/conf/ConfigurationService.java   |  1 -
 .../auth/cas/conf/PrivateKeyGuacamoleProperty.java      |  5 -----
 .../apache/guacamole/auth/cas/form/CASTicketField.java  |  2 --
 .../guacamole-auth-cas/src/main/resources/casModule.js  |  3 +--
 5 files changed, 3 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


Reply via email to