[GitHub] [guacamole-server] necouchman commented on issue #243: GUACAMOLE-249: Migrate to FreeRDP 2.x

2020-01-14 Thread GitBox
necouchman commented on issue #243: GUACAMOLE-249: Migrate to FreeRDP 2.x URL: https://github.com/apache/guacamole-server/pull/243#issuecomment-574134215 Sounds good. Giving @jmuehlner one last chance to throw in any input - otherwise I'll plan to merge it later today. You mentioned

[GitHub] [guacamole-server] mike-jumper commented on issue #243: GUACAMOLE-249: Migrate to FreeRDP 2.x

2020-01-14 Thread GitBox
mike-jumper commented on issue #243: GUACAMOLE-249: Migrate to FreeRDP 2.x URL: https://github.com/apache/guacamole-server/pull/243#issuecomment-574312304 > You mentioned needing to deal with conflicts in the master - anything special that we need to worry about for that? Only that t

[GitHub] [guacamole-server] necouchman commented on issue #243: GUACAMOLE-249: Migrate to FreeRDP 2.x

2020-01-14 Thread GitBox
necouchman commented on issue #243: GUACAMOLE-249: Migrate to FreeRDP 2.x URL: https://github.com/apache/guacamole-server/pull/243#issuecomment-574319403 Sounds good...I think it's go time... :shipit: This is an automat

[GitHub] [guacamole-server] necouchman merged pull request #243: GUACAMOLE-249: Migrate to FreeRDP 2.x

2020-01-14 Thread GitBox
necouchman merged pull request #243: GUACAMOLE-249: Migrate to FreeRDP 2.x URL: https://github.com/apache/guacamole-server/pull/243 This is an automated message from the Apache Git Service. To respond to the message, please l

[GitHub] [guacamole-server] necouchman commented on issue #243: GUACAMOLE-249: Migrate to FreeRDP 2.x

2020-01-14 Thread GitBox
necouchman commented on issue #243: GUACAMOLE-249: Migrate to FreeRDP 2.x URL: https://github.com/apache/guacamole-server/pull/243#issuecomment-574330961 Okay, merge to `staging/1.1.0` is done. I have to step out for a little while, but will work through the merge to master here, shortly.

[GitHub] [guacamole-server] necouchman commented on issue #243: GUACAMOLE-249: Migrate to FreeRDP 2.x

2020-01-14 Thread GitBox
necouchman commented on issue #243: GUACAMOLE-249: Migrate to FreeRDP 2.x URL: https://github.com/apache/guacamole-server/pull/243#issuecomment-574386165 Merge to `master` completed. I had to work around a couple of settings that got added into master, but I think I've managed to do it wit

Build failed in Jenkins: guacamole-server-master-docker #38

2020-01-14 Thread Apache Jenkins Server
See Changes: [mjumper] GUACAMOLE-249: Migrate to newer API (partial). [mjumper] GUACAMOLE-249: Remove all legacy FreeRDP compatibility. [mjumper] GUACAMOLE-249: Remove usage of CLRCONV. [mjumper] G

Re: Build failed in Jenkins: guacamole-server-master-docker #38

2020-01-14 Thread Mike Jumper
Ah, I had this set to oldstable. I'll switch it. On Tue, Jan 14, 2020, 14:00 Apache Jenkins Server wrote: > See < > https://builds.apache.org/job/guacamole-server-master-docker/38/display/redirect?page=changes > > > > Changes: > > [mjumper] GUACAMOLE-249: Migrate to newer API (partial). > > [mju

Build failed in Jenkins: guacamole-server-master-docker #39

2020-01-14 Thread Apache Jenkins Server
See Changes: -- Started by upstream project "guacamole-server-master" build number 108 originally caused by: Started by an SCM change Running as SYSTEM [EnvInject] - Loadi

Jenkins build is back to normal : guacamole-server-master-docker #40

2020-01-14 Thread Apache Jenkins Server
See

[GitHub] [guacamole-server] mike-jumper commented on issue #243: GUACAMOLE-249: Migrate to FreeRDP 2.x

2020-01-14 Thread GitBox
mike-jumper commented on issue #243: GUACAMOLE-249: Migrate to FreeRDP 2.x URL: https://github.com/apache/guacamole-server/pull/243#issuecomment-574428523 Looks real solid. I just manually tried merging the previous `HEAD` of `master` onto my test merge resolution branch, resolved the confl

[GitHub] [guacamole-server] mike-jumper opened a new pull request #244: GUACAMOLE-249: Remove extra warning resulting from merge.

2020-01-14 Thread GitBox
mike-jumper opened a new pull request #244: GUACAMOLE-249: Remove extra warning resulting from merge. URL: https://github.com/apache/guacamole-server/pull/244 The merge of `staging/1.1.0` to `master` resulted in the addition of a warning if both copy and paste are disabled. I think this pr

[GitHub] [guacamole-server] necouchman merged pull request #244: GUACAMOLE-249: Remove extra warning resulting from merge.

2020-01-14 Thread GitBox
necouchman merged pull request #244: GUACAMOLE-249: Remove extra warning resulting from merge. URL: https://github.com/apache/guacamole-server/pull/244 This is an automated message from the Apache Git Service. To respond to