You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2017/09/25 18:54:58 UTC
[1/2] incubator-guacamole-client git commit: GUACAMOLE-395: Populate
"expired" property of Guacamole users defined via MySQL / MariaDB.
Repository: incubator-guacamole-client
Updated Branches:
refs/heads/master b90a98946 -> 93e42f829
GUACAMOLE-395: Populate "expired" property of Guacamole users defined via MySQL / MariaDB.
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/22760b5d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/22760b5d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/22760b5d
Branch: refs/heads/master
Commit: 22760b5d0b722bfcb0380c37f7414868eebf40bb
Parents: b90a989
Author: Michael Jumper <mj...@apache.org>
Authored: Tue Sep 12 13:04:48 2017 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Mon Sep 25 11:39:03 2017 -0700
----------------------------------------------------------------------
.../resources/org/apache/guacamole/auth/jdbc/user/UserMapper.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/22760b5d/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/user/UserMapper.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/user/UserMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/user/UserMapper.xml
index 0ddb051..4ab1182 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/user/UserMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/user/UserMapper.xml
@@ -31,6 +31,7 @@
<result column="password_salt" property="passwordSalt" jdbcType="BINARY"/>
<result column="password_date" property="passwordDate" jdbcType="TIMESTAMP"/>
<result column="disabled" property="disabled" jdbcType="BOOLEAN"/>
+ <result column="expired" property="expired" jdbcType="BOOLEAN"/>
<result column="access_window_start" property="accessWindowStart" jdbcType="TIME"/>
<result column="access_window_end" property="accessWindowEnd" jdbcType="TIME"/>
<result column="valid_from" property="validFrom" jdbcType="DATE"/>
[2/2] incubator-guacamole-client git commit: GUACAMOLE-395: Merge
Populate expired property of Guacamole users defined via MySQL/MariaDB
Posted by vn...@apache.org.
GUACAMOLE-395: Merge Populate expired property of Guacamole users defined via MySQL/MariaDB
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/93e42f82
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/93e42f82
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/93e42f82
Branch: refs/heads/master
Commit: 93e42f8299da17eeef124d4b20377af5d8e04c8a
Parents: b90a989 22760b5
Author: Nick Couchman <vn...@apache.org>
Authored: Mon Sep 25 14:50:47 2017 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Mon Sep 25 14:50:47 2017 -0400
----------------------------------------------------------------------
.../resources/org/apache/guacamole/auth/jdbc/user/UserMapper.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------