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 138
    • Merge requests 138
  • 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
    • Repository
  • Activity
  • Graph
  • Jobs
  • Commits
Collapse sidebar
  • atlasatlas
  • athenaathena
  • Merge requests
  • !47047

Manual cherrypick for MR 46724

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Peter Berta requested to merge pberta/athena:21.0-mc16a-pberta-manual-cherrypick-MR-46724 into 21.0-mc16a Oct 08, 2021
  • Overview 3
  • Commits 2
  • Pipelines 1
  • Changes 1

This MR is a manual cherry-pick of the changes in !46724 (merged) (merged) to fix ATEAM-780 in 21.0-mc16a. But it seems the two branches (master and 21.0-mc16a) diverged quite a lot and there were conflicts. I tried to resolve them but there are much more changes in this MR as in the original MR !46724 (merged) (merged). @ssnyder , can you please take a loo whether this MR is ok?

Edited Oct 08, 2021 by Peter Berta
Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: 21.0-mc16a-pberta-manual-cherrypick-MR-46724