Skip to content

Commit

Permalink
Merge pull request kubernetes#27916 from krousey/bump_inotify
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue

Bump inotify to pickup fix for memory leak

Just picking up the fix I made in https://go-review.googlesource.com/#/c/24289/

Hopefully this will help kubernetes#27456 


cc: @kubernetes/sig-node @lavalamp
  • Loading branch information
k8s-merge-robot authored Jun 23, 2016
2 parents d5da5b5 + 751af3a commit cb10d7d
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 11 deletions.
4 changes: 2 additions & 2 deletions Godeps/Godeps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 15 additions & 9 deletions vendor/golang.org/x/exp/inotify/inotify_linux.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit cb10d7d

Please sign in to comment.