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 2016/07/14 16:39:47 UTC

[1/2] incubator-guacamole-client git commit: GUACAMOLE-5: Remove path from tunnel collection resource, as it is no longer a root resource.

Repository: incubator-guacamole-client
Updated Branches:
  refs/heads/master 6e81a2018 -> de2dc9dd9


GUACAMOLE-5: Remove path from tunnel collection resource, as it is no longer a root resource.


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/6b98ce2c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/6b98ce2c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/6b98ce2c

Branch: refs/heads/master
Commit: 6b98ce2c671ac86b60c6146cd16ac240a6cc7622
Parents: 6e81a20
Author: Michael Jumper <mj...@apache.org>
Authored: Wed Jul 13 22:16:24 2016 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Wed Jul 13 22:16:24 2016 -0700

----------------------------------------------------------------------
 .../org/apache/guacamole/rest/tunnel/TunnelCollectionResource.java  | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/6b98ce2c/guacamole/src/main/java/org/apache/guacamole/rest/tunnel/TunnelCollectionResource.java
----------------------------------------------------------------------
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/tunnel/TunnelCollectionResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/tunnel/TunnelCollectionResource.java
index 342cc76..cd9cb4e 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/tunnel/TunnelCollectionResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/tunnel/TunnelCollectionResource.java
@@ -37,7 +37,6 @@ import org.apache.guacamole.tunnel.StreamInterceptingTunnel;
  *
  * @author Michael Jumper
  */
-@Path("/tunnels")
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
 public class TunnelCollectionResource {


[2/2] incubator-guacamole-client git commit: GUACAMOLE-5: Merge change to remove PATH from tunnel resource class.

Posted by jm...@apache.org.
GUACAMOLE-5: Merge change to remove PATH from tunnel resource class.


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/de2dc9dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/de2dc9dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/de2dc9dd

Branch: refs/heads/master
Commit: de2dc9dd90c7e09e216a7c4cd4bbf12fbe928e3a
Parents: 6e81a20 6b98ce2
Author: James Muehlner <ja...@guac-dev.org>
Authored: Thu Jul 14 09:38:52 2016 -0700
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Thu Jul 14 09:38:52 2016 -0700

----------------------------------------------------------------------
 .../org/apache/guacamole/rest/tunnel/TunnelCollectionResource.java  | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------