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

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

commit 8f27896dca01e11453e02787277d0754bfd65c7b
Merge: 1bbf9f0 215b643
Author: Virtually Nick <vn...@apache.org>
AuthorDate: Sat Feb 9 14:24:49 2019 -0500

    Merge 1.1.0 changes back to master.

 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 ++--
 .../guacamole-auth-header/src/main/resources/guac-manifest.json   | 2 +-
 .../guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml  | 2 +-
 .../guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml  | 8 ++++----
 .../guacamole-auth-jdbc/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 ++--
 .../guacamole-auth-ldap/src/main/resources/guac-manifest.json     | 2 +-
 extensions/guacamole-auth-openid/pom.xml                          | 4 ++--
 .../guacamole-auth-openid/src/main/resources/guac-manifest.json   | 2 +-
 extensions/guacamole-auth-quickconnect/pom.xml                    | 4 ++--
 .../src/main/resources/guac-manifest.json                         | 2 +-
 extensions/guacamole-auth-radius/pom.xml                          | 6 +++---
 .../guacamole-auth-radius/src/main/resources/guac-manifest.json   | 2 +-
 extensions/guacamole-auth-totp/pom.xml                            | 4 ++--
 .../guacamole-auth-totp/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-ext/pom.xml                                             | 4 ++--
 guacamole/pom.xml                                                 | 8 ++++----
 .../main/java/org/apache/guacamole/extension/ExtensionModule.java | 3 ++-
 pom.xml                                                           | 2 +-
 34 files changed, 59 insertions(+), 58 deletions(-)

Reply via email to