Skip to content
GitLab
  • Menu
Projects Groups Snippets
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in / Register
  • Wellbore Domain Services Wellbore Domain Services
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 12
    • Issues 12
    • List
    • Boards
    • Service Desk
    • Milestones
    • Iterations
    • Requirements
  • Merge requests 13
    • Merge requests 13
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test Cases
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages & Registries
    • Packages & Registries
    • Package Registry
    • Container Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Insights
    • Issue
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • Open Subsurface Data Universe Software
  • Platform
  • Domain Data Mgmt Services
  • Wellbore
  • Wellbore Domain ServicesWellbore Domain Services
  • Merge requests
  • !60

Slb merge resolve

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Luc Yriarte requested to merge slb-merge-resolve into master Apr 02, 2021
  • Overview 2
  • Commits 2
  • Pipelines 4
  • Changes 7

This is a finer pass at merge conflicts resolutions and documentation mismatches since the slb codebase was transferred to gitlab.

Changes are more in the documentation and the CICD than the code itself - mainly about removing references to the entitlement service we're not using directly anymore.

Edited Apr 02, 2021 by Luc Yriarte
Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: slb-merge-resolve