Merge 0.9.14 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/d73a0ece Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/d73a0ece Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/d73a0ece Branch: refs/heads/master Commit: d73a0ece29a9faeb5203d4e7069837523836be05 Parents: 0757d7e 8c2a76b Author: Nick Couchman <vn...@apache.org> Authored: Mon Jan 1 16:29:38 2018 -0500 Committer: Nick Couchman <vn...@apache.org> Committed: Mon Jan 1 16:29:38 2018 -0500 ---------------------------------------------------------------------- doc/guacamole-example/pom.xml | 6 +++--- doc/guacamole-playback-example/pom.xml | 4 ++-- extensions/guacamole-auth-cas/pom.xml | 6 +++--- .../guacamole-auth-cas/src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-duo/pom.xml | 4 ++-- .../guacamole-auth-duo/src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-header/pom.xml | 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- .../modules/guacamole-auth-jdbc-base/pom.xml | 2 +- .../modules/guacamole-auth-jdbc-dist/pom.xml | 8 ++++---- .../modules/guacamole-auth-jdbc-mysql/pom.xml | 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- .../modules/guacamole-auth-jdbc-postgresql/pom.xml | 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- .../modules/guacamole-auth-jdbc-sqlserver/pom.xml | 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-jdbc/pom.xml | 4 ++-- extensions/guacamole-auth-ldap/pom.xml | 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-noauth/pom.xml | 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-openid/pom.xml | 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- guacamole-common-js/pom.xml | 2 +- guacamole-common-js/src/main/webapp/modules/Version.js | 2 +- guacamole-common/pom.xml | 2 +- guacamole-docker/README.md | 5 +++-- guacamole-ext/pom.xml | 4 ++-- guacamole/pom.xml | 8 ++++---- .../java/org/apache/guacamole/extension/ExtensionModule.java | 2 +- pom.xml | 2 +- 31 files changed, 54 insertions(+), 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/d73a0ece/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/guac-manifest.json ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/d73a0ece/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/guac-manifest.json ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/d73a0ece/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/guac-manifest.json ----------------------------------------------------------------------
