Merge 0.9.11-incubating changes back to master.
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/005f6153 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/005f6153 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/005f6153 Branch: refs/heads/master Commit: 005f6153f87d6d58702adc114618ad893ce04810 Parents: 7219957 d440bc7 Author: James Muehlner <[email protected]> Authored: Sun Jan 22 12:43:45 2017 -0800 Committer: James Muehlner <[email protected]> Committed: Sun Jan 22 12:43:45 2017 -0800 ---------------------------------------------------------------------- .../guacamole-auth-jdbc-mysql/schema/001-create-schema.sql | 2 +- .../schema/002-create-admin-user.sql | 5 +++-- .../schema/upgrade/upgrade-pre-0.9.11.sql | 7 ++++++- .../schema/001-create-schema.sql | 2 +- .../schema/002-create-admin-user.sql | 5 +++-- .../schema/upgrade/upgrade-pre-0.9.11.sql | 7 ++++++- 6 files changed, 20 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
