You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2017/06/05 18:31:48 UTC
[1/3] incubator-guacamole-client git commit: Merging
0.9.13-incubating changes back to master.
Repository: incubator-guacamole-client
Updated Branches:
refs/heads/staging/0.9.13-incubating 24708cf91 -> 193089fb6
Merging 0.9.13-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/bedd09fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/bedd09fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/bedd09fc
Branch: refs/heads/staging/0.9.13-incubating
Commit: bedd09fc104c2c9b8f9e8b76d44482d77eb69473
Parents: 3beedd1 24708cf
Author: Nick Couchman <vn...@apache.org>
Authored: Sat Jun 3 23:01:50 2017 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Sat Jun 3 23:01:50 2017 -0400
----------------------------------------------------------------------
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 | 6 +++---
.../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 +-
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 +-
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 ++++----
pom.xml | 2 +-
25 files changed, 43 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
[3/3] incubator-guacamole-client git commit: GUACAMOLE-314: Merge
extension API sanity check version number bump.
Posted by jm...@apache.org.
GUACAMOLE-314: Merge extension API sanity check version number bump.
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/193089fb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/193089fb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/193089fb
Branch: refs/heads/staging/0.9.13-incubating
Commit: 193089fb66cf2d113c3766de12d4f38a5609498e
Parents: bedd09f 6c0957e
Author: James Muehlner <ja...@guac-dev.org>
Authored: Mon Jun 5 11:30:08 2017 -0700
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Mon Jun 5 11:30:08 2017 -0700
----------------------------------------------------------------------
.../main/java/org/apache/guacamole/extension/ExtensionModule.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] incubator-guacamole-client git commit: GUACAMOLE-314: Update
extension API version sanity check to include the correct,
recently-bumped version number.
Posted by jm...@apache.org.
GUACAMOLE-314: Update extension API version sanity check to include the correct, recently-bumped version number.
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/6c0957e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/6c0957e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/6c0957e7
Branch: refs/heads/staging/0.9.13-incubating
Commit: 6c0957e7dedb47afe20b9ae2b5c5219c5cca3e75
Parents: 24708cf
Author: Michael Jumper <mj...@apache.org>
Authored: Sun Jun 4 13:18:57 2017 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sun Jun 4 13:18:57 2017 -0700
----------------------------------------------------------------------
.../main/java/org/apache/guacamole/extension/ExtensionModule.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/6c0957e7/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java
----------------------------------------------------------------------
diff --git a/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java b/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java
index 528f786..792066c 100644
--- a/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java
@@ -59,7 +59,7 @@ public class ExtensionModule extends ServletModule {
private static final List<String> ALLOWED_GUACAMOLE_VERSIONS =
Collections.unmodifiableList(Arrays.asList(
"*",
- "0.9.12-incubating"
+ "0.9.13-incubating"
));
/**