Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added documentation key to syncthing-resume.service #3109

Closed
wants to merge 3 commits into from

Conversation

aviau
Copy link
Contributor

@aviau aviau commented May 17, 2016

this fixes lintian warning:

systemd-service-file-missing-documentation-key lib/systemd/system/syncthing-resume.service

@lkwg82
Copy link
Contributor

lkwg82 commented May 17, 2016

please add a line with your email in the AUTHORS file

@aviau
Copy link
Contributor Author

aviau commented May 17, 2016

@lkwg82 done

@AudriusButkevicius
Copy link
Member

@rumpelsepp I have no idea if this is correct. Mind confirming?

@rumpelsepp
Copy link
Contributor

@st-review Merge this please.

@st-review
Copy link

@rumpelsepp: Merge failed:

$ git fetch -f origin refs/pull/3109/head:pr-3109
$ git fetch -f origin master:orig/master
From github.com:syncthing/syncthing
   ee94d53..cd05282  master     -> orig/master
$ git reset --hard
HEAD is now at cd05282 lib/connection: Remove unused functions
$ git checkout master
Already on 'master'
Your branch is up-to-date with 'origin/master'.
$ git reset --hard orig/master
HEAD is now at cd05282 lib/connection: Remove unused functions
$ git clean -fxd
Skipping repository syncthing/syncthing
Skipping repository syncthing/syncthing-android
Skipping repository syncthing/docs
Skipping repository syncthing/discosrv
Skipping repository syncthing/syncthing-gtk
Skipping repository syncthing/syncthing-inotify
$ git merge --squash --no-commit pr-3109
Automatic merge went well; stopped before committing as requested
Squash commit -- not updating HEAD
$ git commit -F -
******************************************************
* Commit message does not match the expected format: *
*                                                    *
*   some/tag: A longer description (fixes #1234)     *
*                                                    *
******************************************************

@rumpelsepp
Copy link
Contributor

@st-review Merge this please.

etc/linux-systemd: Add documentation key to syncthing-resume.service

@st-review
Copy link

@rumpelsepp: Merge failed:

$ git fetch -f origin refs/pull/3109/head:pr-3109
$ git fetch -f origin master:orig/master
$ git reset --hard
HEAD is now at cd05282 lib/connection: Remove unused functions
$ git checkout master
Already on 'master'
Your branch is up-to-date with 'origin/master'.
$ git reset --hard orig/master
HEAD is now at cd05282 lib/connection: Remove unused functions
$ git clean -fxd
Skipping repository syncthing/syncthing
Skipping repository syncthing/syncthing-android
Skipping repository syncthing/docs
Skipping repository syncthing/discosrv
Skipping repository syncthing/syncthing-gtk
Skipping repository syncthing/syncthing-inotify
$ git merge --squash --no-commit pr-3109
Automatic merge went well; stopped before committing as requested
Squash commit -- not updating HEAD
$ git commit -F -
******************************************************
* Commit message does not match the expected format: *
*                                                    *
*   some/tag: A longer description (fixes #1234)     *
*                                                    *
******************************************************

@rumpelsepp
Copy link
Contributor

rumpelsepp commented May 17, 2016

Holy cow, what am I doing wrong? A (fixes #FOO) thing doesn't make sense here...

@AudriusButkevicius
Copy link
Member

@st-review merge

etc: Add documentation key to syncthing-resume.service

@st-review
Copy link

👌 Merged as 73ae87f. Thanks, @aviau!

@st-review st-review closed this May 17, 2016
st-review pushed a commit that referenced this pull request May 17, 2016
@rumpelsepp
Copy link
Contributor

Fail.

@AudriusButkevicius
Copy link
Member

It doesn't like dashes I guess.

@aviau aviau deleted the systemd-doc branch May 17, 2016 20:25
@st-review st-review added the frozen-due-to-age Issues closed and untouched for a long time, together with being locked for discussion label Jun 16, 2017
@syncthing syncthing locked and limited conversation to collaborators Jun 16, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
frozen-due-to-age Issues closed and untouched for a long time, together with being locked for discussion
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants