Skip to content

GitLab

  • Menu
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 138
    • Merge requests 138
  • 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
  • !30691

Manual sweep of !29074 into master (precision recommendations for isolation)

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Nicolas Koehler requested to merge nkoehler/athena:mecSwp2 into master Feb 27, 2020
  • Overview 6
  • Commits 3
  • Pipelines 2
  • Changes 15

Hi,

the automatic sweep of !29074 (merged) from 21.2 into master failed, since there were conflicts in the plotting python macros (@jojungge) and the _entries.cxx. I resolved the conflicts and now do the manual sweep of !29074 (merged) into master here.

Best, Nico

Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: mecSwp2