Skip to content
  • This project
    • Loading...
  • Sign in

nexedi / slapos.package

Go to a project
Toggle navigation
Toggle navigation pinning
  • Projects
  • Groups
  • Snippets
  • Help
  • Project
  • Activity
  • Repository
  • Pipelines
  • Graphs
  • Issues 0
  • Merge Requests 6
  • Wiki
  • Network
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Merged
Merge Request !61 opened 2018-07-11 16:19:08 UTC by Guillaume Hervier@guillaume.hervier

playbook[roles/vifib-kernel]: Remove dependency to Debian 9 workaround

Edited 2018-07-11 17:10:20 UTC
Request to merge guillaume.hervier:fix-59 into master
×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://lab.nexedi.com/guillaume.hervier/slapos.package.git fix-59
git checkout -b guillaume.hervier/slapos.package-fix-59 FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff guillaume.hervier/slapos.package-fix-59

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Merged

The changes were merged into master.

  • Discussion 0
  • Commits 1
  • Changes 1
  • {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • @guillaume.hervier Guillaume Hervier
    @guillaume.hervier

    mentioned in commit 10df0873

    2018-07-11 17:10:19 UTC

    mentioned in commit 10df0873

    Toggle commit list
  • @rafael Rafael Monnerat
    @rafael

    Status changed to merged

    2018-07-11 17:10:20 UTC

    Status changed to merged

    Toggle commit list
  • Write
  • Preview
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
  • Please register or sign in to post a comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: nexedi/slapos.package!61
×

Revert this commit

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this commit

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备14008524号