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/13 05:09:59 UTC

[21/24] incubator-guacamole-client git commit: GUACAMOLE-5: DirectoryResource deals with objects, not users.

GUACAMOLE-5: DirectoryResource deals with objects, not users.

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

Branch: refs/heads/master
Commit: aeec3eca4009745bce70e9ca1399a42de4dde9b0
Parents: e4ed85c
Author: Michael Jumper <mj...@apache.org>
Authored: Tue Jul 12 21:40:58 2016 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue Jul 12 21:40:58 2016 -0700

----------------------------------------------------------------------
 .../org/apache/guacamole/rest/directory/DirectoryResource.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/aeec3eca/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryResource.java
----------------------------------------------------------------------
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryResource.java
index ee4fd2c..1716545 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/directory/DirectoryResource.java
@@ -130,8 +130,8 @@ public class DirectoryResource<InternalType extends Identifiable, ExternalType>
      *
      * @param permissions
      *     The set of permissions to filter with. A user must have one or more
-     *     of these permissions for a user to appear in the result.
-     *     If null, no filtering will be performed.
+     *     of these permissions for the affected objects to appear in the
+     *     result. If null, no filtering will be performed.
      *
      * @return
      *     A map of all visible objects. If a permission was specified, this