Merge pull request #676 from vmarmol/release

Update inotify dependency.

Godeps/Godeps.json

@@ -10,11 +10,6 @@
 			"Comment": "null-5",
 			"Rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675"
 		},
-		{
-			"ImportPath": "code.google.com/p/go.exp/inotify",
-			"Comment": "null-75",
-			"Rev": "bd8df7009305d6ada223ea3c95b94c0f38bfa119"
-		},
 		{
 			"ImportPath": "code.google.com/p/gomock/gomock",
 			"Rev": "5d0b59c9f277f888d2c70b00908236a30ab90f45"
@@ -185,6 +180,10 @@
 			"ImportPath": "github.com/syndtr/gocapability/capability",
 			"Rev": "3c85049eaeb429febe7788d9c7aac42322a377fe"
 		},
+		{
+			"ImportPath": "golang.org/x/exp/inotify",
+			"Rev": "d00e13ec443927751b2bd49e97dea7bf3b6a6487"
+		},
 		{
 			"ImportPath": "golang.org/x/net/context",
 			"Rev": "7dbad50ab5b31073856416cdcfeb2796d682f844"

Godeps/_workspace/src/golang.org/x/exp/inotify/inotify_linux.go

@@ -24,7 +24,7 @@ Example:
     }
 
 */
-package inotify
+package inotify // import "golang.org/x/exp/inotify"
 
 import (
 	"errors"
@@ -221,7 +221,7 @@ func (e *Event) String() string {
 
 	m := e.Mask
 	for _, b := range eventBits {
-		if m&b.Value != 0 {
+		if m&b.Value == b.Value {
 			m &^= b.Value
 			events += "|" + b.Name
 		}

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 {