On Tue, Apr 16, 2024 at 11:46 AM Nick Couchman <[email protected]> wrote:
> On Tue, Apr 16, 2024 at 11:38 AM Demarteau Benjamin > <[email protected]> wrote: > >> Hello, >> >> I was looking to get the code written in 2022 for GUACAMOLE-1372 [1] and >> [2] and somehow don't see it in the 1.5.5 release from 2 weeks ago. >> >> I'm really weirded out by this. If you look at the diff between 1.5.5 and >> main [3], there are 436 commits since 1.5.5 while there were only 16 or so >> if you look at the commits from main [4]. >> >> Does the team have any insight into this ? >> >> > Yes - we do not necessarily place all of the commits in our git repo in > the latest release. > > The 1.5.5 release was a bug fix release for the 1.5.x series, so the only > Jira issues and commits included in it are ones that were specifically > designed to address bugs in the 1.5.x code, and not any that would > introduce new functionality or features. As such, the staging/1.5.5 branch, > which contained the changes for the 1.5.5 release, really comes out of the > 1.5.0 release back in early 2023, which was started in 2022. > > The pull requests you referenced, and their associated Jira issues, are > going into the main branch (formerly the master branch), and will target > (mostly) the 1.6.0 version. We also have a couple of issues out there that > will go into the next branch, instead of the main branch, because they are > targeted at the next major release of Guacamole, likely 2.0.0. > > Here's the Jira issue, for reference - you can see it marked for the "1.6.0" release: https://issues.apache.org/jira/browse/GUACAMOLE-1372 >
