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/53d5bf18 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/53d5bf18 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/53d5bf18 Branch: refs/heads/master Commit: 53d5bf184e0595abb41ea0b46e997517229a63af Parents: 649fd8c f75786a Author: Nick Couchman <vn...@apache.org> Authored: Wed Dec 6 09:50:42 2017 -0500 Committer: Nick Couchman <vn...@apache.org> Committed: Wed Dec 6 09:50:42 2017 -0500 ---------------------------------------------------------------------- CONTRIBUTING | 8 ++++---- DISCLAIMER | 7 ------- README | 4 ++-- doc/guacamole-example/pom.xml | 2 +- doc/guacamole-playback-example/pom.xml | 2 +- extensions/guacamole-auth-cas/pom.xml | 2 +- .../guacamole-auth-cas/src/licenses/DISCLAIMER | 7 ------- extensions/guacamole-auth-duo/pom.xml | 2 +- .../guacamole-auth-duo/src/licenses/DISCLAIMER | 7 ------- extensions/guacamole-auth-header/pom.xml | 2 +- .../src/licenses/DISCLAIMER | 7 ------- .../modules/guacamole-auth-jdbc-base/pom.xml | 2 +- .../modules/guacamole-auth-jdbc-dist/pom.xml | 2 +- .../src/licenses/DISCLAIMER | 7 ------- .../modules/guacamole-auth-jdbc-mysql/pom.xml | 2 +- .../guacamole-auth-jdbc-postgresql/pom.xml | 2 +- .../guacamole-auth-jdbc-sqlserver/pom.xml | 2 +- extensions/guacamole-auth-jdbc/pom.xml | 2 +- extensions/guacamole-auth-ldap/pom.xml | 2 +- .../guacamole-auth-ldap/src/licenses/DISCLAIMER | 7 ------- extensions/guacamole-auth-noauth/pom.xml | 2 +- .../src/licenses/DISCLAIMER | 7 ------- extensions/guacamole-auth-openid/pom.xml | 2 +- .../src/licenses/DISCLAIMER | 7 ------- guacamole-common-js/pom.xml | 20 +++----------------- guacamole-common/pom.xml | 20 +++----------------- guacamole-docker/README.md | 18 +++++++++--------- guacamole-docker/bin/build-guacamole.sh | 10 +++++----- guacamole-ext/pom.xml | 20 +++----------------- guacamole/pom.xml | 20 +++----------------- guacamole/src/licenses/DISCLAIMER | 7 ------- pom.xml | 2 +- 32 files changed, 47 insertions(+), 166 deletions(-) ----------------------------------------------------------------------
