GUACAMOLE-259: Merge addition of new TRACE log level.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/457c48ec Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/457c48ec Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/457c48ec Branch: refs/heads/master Commit: 457c48ec71f9e68510a478db0aa68aa3e4928fb2 Parents: aba2b46 e910dcb Author: James Muehlner <[email protected]> Authored: Fri Mar 31 10:45:41 2017 -0700 Committer: James Muehlner <[email protected]> Committed: Fri Mar 31 10:45:41 2017 -0700 ---------------------------------------------------------------------- src/guacd/conf-args.c | 2 +- src/guacd/conf-file.c | 2 +- src/guacd/conf-parse.c | 1 + src/guacd/log.c | 6 ++++++ src/guacd/man/guacd.8 | 1 + src/guacd/man/guacd.conf.5 | 1 + src/libguac/guacamole/client-types.h | 17 +++++++++++++---- 7 files changed, 24 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
