You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-dev@db.apache.org by GitBox <gi...@apache.org> on 2022/06/12 12:31:58 UTC
[GitHub] [db-jdo] tzaeschke opened a new pull request, #53: Missing updates from 3.2 branch
tzaeschke opened a new pull request, #53:
URL: https://github.com/apache/db-jdo/pull/53
The 3.2 branch wasn't merged into main after the 3.2 release.
The branch did not contain any features (which were all in the main branch already) but only changes to some xml and other document files.
This PR contains missing changes that should still be merged into main, even though we already had a 3.2 release.
This PR is equivalent to rebasing 3.2 HEAD onto main HEAD.
The parent commit of 3.2 is 9205b733 from 07/10/2021 at 21:13
Comparing 3.2 HEAD against 9205b733caeac377e0078a05206839268fdcf0f0 shows the following files have changed:
However, during rebase, the following conflicts were shown:
Notably, all of the spec files appear to have been modified. I assume this can be ignored but that needs to be confirmed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jdo-dev-unsubscribe@db.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [db-jdo] tzaeschke closed pull request #53: Missing updates from 3.2 branch
Posted by GitBox <gi...@apache.org>.
tzaeschke closed pull request #53: Missing updates from 3.2 branch
URL: https://github.com/apache/db-jdo/pull/53
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jdo-dev-unsubscribe@db.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [db-jdo] tzaeschke commented on pull request #53: Missing updates from 3.2 branch
Posted by GitBox <gi...@apache.org>.
tzaeschke commented on PR #53:
URL: https://github.com/apache/db-jdo/pull/53#issuecomment-1156849310
In summary, apparently all that needs merging is one paragraph missing in the HowToReleaseJdo.
Spec changes die not really happen in the 3.2 branch (as far as we can tell), all other changes are version number changes which are superceded by changes when releasing 3.2.1
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jdo-dev-unsubscribe@db.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [db-jdo] tzaeschke merged pull request #53: Missing updates from 3.2 branch
Posted by GitBox <gi...@apache.org>.
tzaeschke merged PR #53:
URL: https://github.com/apache/db-jdo/pull/53
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jdo-dev-unsubscribe@db.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org