Merge 0.9.14-incubating changes back to master.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/0611fe8f Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/0611fe8f Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/0611fe8f Branch: refs/heads/master Commit: 0611fe8fff694dff7e3cb6a62918f6c90668728c Parents: 6984569 393c70f Author: Michael Jumper <[email protected]> Authored: Sat Oct 28 22:22:50 2017 -0700 Committer: Michael Jumper <[email protected]> Committed: Sat Oct 28 22:22:50 2017 -0700 ---------------------------------------------------------------------- .../cas/conf/PrivateKeyGuacamoleProperty.java | 51 +++++++++++--------- 1 file changed, 29 insertions(+), 22 deletions(-) ----------------------------------------------------------------------
