Skip to content
GitLab
Projects Groups Snippets
  • /
  • 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 164
    • Merge requests 164
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Releases
  • Packages and registries
    • Packages and registries
    • Container Registry
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Insights
    • Repository
  • Activity
  • Graph
  • Jobs
  • Commits
Collapse sidebar
  • atlasatlas
  • athenaathena
  • Merge requests
  • !24147

Merge release/21.3.14 into 21.9 branch

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged John Derek Chapman requested to merge jchapman/athena:Merge21.3.14into21.9branch into 21.9 Jun 12, 2019
  • Overview 3
  • Commits 388
  • Pipelines 1
  • Changes 272

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.

Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: Merge21.3.14into21.9branch