Merge pull request kubernetes#676 from vmarmol/release

Update inotify dependency.
vishh · May 4, 2015 · 61bbe50 · 61bbe50
2 parents 35e8762 + 1a1a1fa
commit 61bbe50
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/...gle.com/p/go.exp/inotify/inotify_linux.go → ...golang.org/x/exp/inotify/inotify_linux.go b/...gle.com/p/go.exp/inotify/inotify_linux.go → ...golang.org/x/exp/inotify/inotify_linux.go
diff --git a/...om/p/go.exp/inotify/inotify_linux_test.go → ...g.org/x/exp/inotify/inotify_linux_test.go b/...om/p/go.exp/inotify/inotify_linux_test.go → ...g.org/x/exp/inotify/inotify_linux_test.go
diff --git a/container/raw/handler.go b/container/raw/handler.go
@@ -24,7 +24,6 @@ import (
 	"strings"
 	"time"
 
-	"code.google.com/p/go.exp/inotify"
 	"github.com/docker/libcontainer/cgroups"
 	cgroup_fs "github.com/docker/libcontainer/cgroups/fs"
 	"github.com/docker/libcontainer/configs"
@@ -34,6 +33,7 @@ import (
 	"github.com/google/cadvisor/fs"
 	info "github.com/google/cadvisor/info/v1"
 	"github.com/google/cadvisor/utils"
+	"golang.org/x/exp/inotify"
 )
 
 type rawContainerHandler struct {