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

lib/fs: make watcher tests even more darwin slowness resistant #4439

Closed
wants to merge 1 commit into from

Conversation

imsodin
Copy link
Member

@imsodin imsodin commented Oct 20, 2017

Apparently I can't push to master, so lets go via PR.

$ git push upstream master 
Counting objects: 5, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (5/5), done.
Writing objects: 100% (5/5), 468 bytes | 468.00 KiB/s, done.
Total 5 (delta 4), reused 0 (delta 0)
remote: Resolving deltas: 100% (4/4), completed with 4 local objects.
remote: error: GH006: Protected branch update failed for refs/heads/master.
remote: error: You're not authorized to push to this branch. Visit https://help.github.com/articles/about-protected-branches/ for more information.
To github.com:syncthing/syncthing.git
 ! [remote rejected]   master -> master (protected branch hook declined)
error: failed to push some refs to 'git@github.com:syncthing/syncthing.git'

@imsodin
Copy link
Member Author

imsodin commented Oct 20, 2017

@st-review merge

@st-review
Copy link

@imsodin: Build status is pending. I'll wait until it goes green and then merge!

@st-review
Copy link

👌 Merged as e700037. Thanks, @imsodin!

@st-review st-review closed this Oct 20, 2017
st-review pushed a commit that referenced this pull request Oct 20, 2017
@imsodin imsodin deleted the fswatcherTest branch October 20, 2017 15:59
@st-review st-review added the pr-merged Legacy label used in the past for pull requests merged to the main tree label Jan 15, 2018
@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 Oct 21, 2018
@syncthing syncthing locked and limited conversation to collaborators Oct 21, 2018
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 pr-merged Legacy label used in the past for pull requests merged to the main tree
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants