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

Avoid concurrent reset of NAT timer (fixes #3337) #3341

Closed
wants to merge 1 commit into from
Closed

Avoid concurrent reset of NAT timer (fixes #3337) #3341

wants to merge 1 commit into from

Conversation

calmh
Copy link
Member

@calmh calmh commented Jun 26, 2016

Trivial little thing. Not bothering to test it because it's painful for other reasons (needing a working *config.Wrapper for example).

@AudriusButkevicius
Copy link
Member

@st-review merge

@st-review
Copy link

@AudriusButkevicius: Merge failed:

$ git fetch -f origin refs/pull/3341/head:pr-3341
$ git fetch -f origin master:orig/master
From github.com:syncthing/syncthing
   502bee9..f343c8b  master     -> orig/master
$ git reset --hard
HEAD is now at f343c8b lib/model, lib/scanner: Silence vet warnings
$ git checkout master
Already on 'master'
Your branch is up-to-date with 'origin/master'.
$ git reset --hard orig/master
HEAD is now at f343c8b lib/model, lib/scanner: Silence vet warnings
$ 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-3341
Updating f343c8b..1c200b6
Fast-forward
Squash commit -- not updating HEAD
 lib/nat/service.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
$ git commit -F -
******************************************************
* Commit message does not match the expected format: *
*                                                    *
*   some/tag: A longer description (fixes #1234)     *
*                                                    *
******************************************************

@calmh
Copy link
Member Author

calmh commented Jun 26, 2016

Sorry.

@calmh
Copy link
Member Author

calmh commented Jun 26, 2016

@st-review merge it

lib/nat: Avoid concurrent reset of NAT timer (fixes #3337)

@st-review
Copy link

👌 Merged as a2dcffc. Thanks, @calmh!

@st-review st-review closed this Jun 26, 2016
st-review pushed a commit that referenced this pull request Jun 26, 2016
@calmh calmh deleted the fix3337 branch June 26, 2016 10:55
@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 26, 2017
@syncthing syncthing locked and limited conversation to collaborators Jun 26, 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

3 participants