[4/4] guacamole-manual git commit: Merge 0.9.14 changes back to master.

2018-01-01 Thread vnick 
Merge 0.9.14 changes back to master.


Project: http://git-wip-us.apache.org/repos/asf/guacamole-manual/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-manual/commit/bd58591f
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-manual/tree/bd58591f
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-manual/diff/bd58591f

Branch: refs/heads/master
Commit: bd58591f179bca9a8c303386b6e95cd3ad39f293
Parents: e3b1362 b391a76
Author: Nick Couchman 
Authored: Mon Jan 1 17:07:41 2018 -0500
Committer: Nick Couchman 
Committed: Mon Jan 1 17:07:41 2018 -0500

--
 src/chapters/cas-auth.xml   |  4 +-
 src/chapters/custom-auth.xml| 12 ++---
 src/chapters/duo-auth.xml   |  4 +-
 src/chapters/guacamole-ext.xml  |  4 +-
 src/chapters/header-auth.xml|  4 +-
 src/chapters/installing.xml | 14 +++---
 src/chapters/jdbc-auth.xml  | 49 +++-
 src/chapters/ldap-auth.xml  |  4 +-
 src/chapters/yourown.xml| 12 ++---
 src/gug.xml |  4 +-
 tutorials/guacamole-auth-tutorial/pom.xml   |  4 +-
 .../src/main/resources/guac-manifest.json   |  2 +-
 tutorials/guacamole-tutorial/pom.xml|  6 +--
 13 files changed, 55 insertions(+), 68 deletions(-)
--

[4/4] guacamole-manual git commit: Merge 0.9.14 changes back to master.

2017-12-11 Thread mjumper 
Merge 0.9.14 changes back to master.


Project: http://git-wip-us.apache.org/repos/asf/guacamole-manual/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-manual/commit/96a27966
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-manual/tree/96a27966
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-manual/diff/96a27966

Branch: refs/heads/master
Commit: 96a27966af65f976ba5707ad25d48c2e02b4f7cb
Parents: 9dc0b1d da3aa5e
Author: Michael Jumper 
Authored: Mon Dec 11 14:43:48 2017 -0800
Committer: Michael Jumper 
Committed: Mon Dec 11 14:43:48 2017 -0800

--
 src/chapters/ldap-auth.xml | 28 
 1 file changed, 28 insertions(+)
--