Skip to content
  • P
    Projects
  • G
    Groups
  • S
    Snippets
  • Help

CIRCLE / agent

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 7
  • Merge Requests 0
  • Wiki
  • Members
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
Merged
Merge request !5 opened Jan 20, 2015 by Bach Dániel@bachdaniel 
  • Report abuse
Report abuse

Freebsd support

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b freebsd origin/freebsd

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 freebsd

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.

  • Discussion 0
  • Commits 51
  • Changes 15
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Bach Dániel @bachdaniel

    Added 1 new commit:

    • d0221951 - fix flake8 warnings
    Jan 20, 2015

    Added 1 new commit:

    • d0221951 - fix flake8 warnings
    Added 1 new commit: * d02219512e4 - fix flake8 warnings
    Toggle commit list
  • Czémán Arnold @cemiarni

    added 1 commit

    • ca12e0d6 - freebsd: remove rc.subr modification, instead add 'network' and 'routing' scripts

    Compare with previous version

    Nov 06, 2018

    added 1 commit

    • ca12e0d6 - freebsd: remove rc.subr modification, instead add 'network' and 'routing' scripts

    Compare with previous version

    added 1 commit * ca12e0d6 - freebsd: remove rc.subr modification, instead add 'network' and 'routing' scripts [Compare with previous version](https://git.ik.bme.hu/circle/agent/merge_requests/5/diffs?diff_id=706&start_sha=d02219512e4642afc6a2b38b7cc5f5416c516ac4)
    Toggle commit list
  • Czémán Arnold @cemiarni

    added 14 commits

    • ca12e0d6...16b8fc3a - 10 commits from branch master
    • 3b82074c - freebsd: move deps to pkg-requirements.txt
    • f6960606 - freebsd: rename circle_agent service to agent
    • a0f8465b - Merge remote-tracking branch 'origin/master' into freebsd
    • a108236a - freebsd: resolve flake8 warnings in FreeBSD specific files

    Compare with previous version

    Nov 07, 2018

    added 14 commits

    • ca12e0d6...16b8fc3a - 10 commits from branch master
    • 3b82074c - freebsd: move deps to pkg-requirements.txt
    • f6960606 - freebsd: rename circle_agent service to agent
    • a0f8465b - Merge remote-tracking branch 'origin/master' into freebsd
    • a108236a - freebsd: resolve flake8 warnings in FreeBSD specific files

    Compare with previous version

    added 14 commits * ca12e0d6...16b8fc3a - 10 commits from branch `master` * 3b82074c - freebsd: move deps to pkg-requirements.txt * f6960606 - freebsd: rename circle_agent service to agent * a0f8465b - Merge remote-tracking branch 'origin/master' into freebsd * a108236a - freebsd: resolve flake8 warnings in FreeBSD specific files [Compare with previous version](https://git.ik.bme.hu/circle/agent/merge_requests/5/diffs?diff_id=707&start_sha=ca12e0d62984ae27d170501ea1f56e8f92515a8f)
    Toggle commit list
  • Czémán Arnold @cemiarni

    added 1 commit

    • dda1b05b - freebsd: made SerialLineReceiverBase's delimiter platform specific

    Compare with previous version

    Nov 07, 2018

    added 1 commit

    • dda1b05b - freebsd: made SerialLineReceiverBase's delimiter platform specific

    Compare with previous version

    added 1 commit * dda1b05b - freebsd: made SerialLineReceiverBase's delimiter platform specific [Compare with previous version](https://git.ik.bme.hu/circle/agent/merge_requests/5/diffs?diff_id=708&start_sha=a108236a54a6ac1ab5ce07aeb84e6392b3be11dd)
    Toggle commit list
  • Czémán Arnold @cemiarni

    merged

    Nov 07, 2018

    merged

    merged
    Toggle commit list
  • Czémán Arnold @cemiarni

    mentioned in commit d2fa1c61

    Nov 07, 2018

    mentioned in commit d2fa1c61

    mentioned in commit d2fa1c61cca527ec2e8c388d144744146f3b04b0
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Bach Dániel
Assignee
Bach Dániel @bachdaniel
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View labels
2
2 participants
Reference: circle/agent!5
×

Revert this merge request

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

Cherry-pick this merge request

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