Skip to content

GitLab

  • Menu
Projects Groups Snippets
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in
  • athena athena
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Jira
    • Jira
  • Merge requests 169
    • Merge requests 169
  • Deployments
    • Deployments
    • Releases
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • Value stream
    • Code review
    • Issue
    • Repository
  • Activity
  • Graph
  • Commits
Collapse sidebar
  • atlas
  • athenaathena
  • Merge requests
  • !24076

Closed
Created Jun 10, 2019 by John Derek Chapman@jchapmanDeveloper
  • Report abuse
Report abuse

WIP: Merge release/21.3.14 into 21.9 branch

  • Overview 7
  • Commits 388
  • Pipelines 1
  • Changes 171+

This merge request merges the changes from the 21.3 branch between release/21.3.13 and release/21.3.14 (including the changes from the 21.0 branch between release/21.0.95 and release/21.0.97) into the 21.9 branch. This is done via a merge of release/21.3.14. (Last 21.3 release to be merged into 21.9 was release/21.3.13.)

release/21.0.96 is a Tier0 release. It alters the output of heavy ion production jobs. release/21.0.97 is a Tier0 release. It is FT0-preserving. release/21.3.14 is otherwise FT0-preserving.

Here is the full diff between https://gitlab.cern.ch/atlas/athena/compare/release/21.3.13...release/21.3.14

NB The changes in !22913 (merged) (which were part of release/21.0.96). Have been left out of this merge due to conflicts with the existing code in 21.9.

Edited Jun 11, 2019 by John Derek Chapman
Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: Merge21.3.14into21.9