Merge pull request google#2060 from sigma/pr/inotify

replace golang.org/x/exp/inotify with standalone library
a110605 · Oct 19, 2018 · c5510ab · c5510ab
2 parents 43a86a3 + 289e560
commit c5510ab
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/container/common/inotify_watcher.go b/container/common/inotify_watcher.go
@@ -17,7 +17,7 @@ package common
 import (
 	"sync"
 
-	"golang.org/x/exp/inotify"
+	inotify "github.com/sigma/go-inotify"
 )
 
 // Watcher for container-related inotify events in the cgroup hierarchy.

diff --git a/manager/watcher/raw/raw.go b/manager/watcher/raw/raw.go
@@ -26,9 +26,9 @@ import (
 	"github.com/google/cadvisor/container/common"
 	"github.com/google/cadvisor/container/libcontainer"
 	"github.com/google/cadvisor/manager/watcher"
+	inotify "github.com/sigma/go-inotify"
 
 	"github.com/golang/glog"
-	"golang.org/x/exp/inotify"
 )
 
 type rawContainerWatcher struct {

diff --git a/utils/tail/tail.go b/utils/tail/tail.go
@@ -25,7 +25,7 @@ import (
 	"time"
 
 	"github.com/golang/glog"
-	"golang.org/x/exp/inotify"
+	inotify "github.com/sigma/go-inotify"
 )
 
 type Tail struct {

diff --git a/vendor/github.com/sigma/go-inotify/README.md b/vendor/github.com/sigma/go-inotify/README.md
diff --git a/...golang.org/x/exp/inotify/inotify_linux.go → ...hub.com/sigma/go-inotify/inotify_linux.go b/...golang.org/x/exp/inotify/inotify_linux.go → ...hub.com/sigma/go-inotify/inotify_linux.go