Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in
otb
otb
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 305
    • Issues 305
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 15
    • Merge Requests 15
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Operations
    • Operations
    • Incidents
    • Environments
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • CI/CD
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • Main Repositories
  • otbotb
  • Merge Requests
  • !160

Merged
Created Jul 05, 2018 by Victor Poughon@poughovContributor

Merge release-6.6 into develop without the shark revert

  • Overview 1
  • Commits 27
  • Changes 7

This is the merge of release-6.6 into develop plus a revert of the revert of the shark upgrade. As discussed in !117 (merged). What I did:

git checkout develop
git checkout -b merge-6.6
git merge release-6.6
git revert 81bed5aee5facd4435b030d81993b660a8e38083 -m 1

I decided to do it in a feature branch against develop, instead of into release-6.6 directly (as suggested by @gpasero in !117 (merged)), so that in case we make a minor release 6.6.1, we can decide if it will contain the upgraded shark dependency independently of develop (which does).

Question: This also contains the fixes related to OpenMP activation for Debian (that enables openMP if shark is built with openMP, etc.). This is something we want in develop, correct?

Assignee
Assign to
Reviewer
Request review from
7.0.0
Milestone
7.0.0
Assign milestone
Time tracking
Source branch: merge-6.6