Merge pull request #445 from laijs/vendor

update vendor
hyperhq · Mar 8, 2017 · e8539fc · e8539fc
2 parents b7cc550 + c88ed9c
commit e8539fc
Show file tree

Hide file tree

Showing 470 changed files with 69,266 additions and 7,203 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/containerd/api/grpc/server/server.go b/containerd/api/grpc/server/server.go
@@ -9,9 +9,9 @@ import (
 	"time"
 
 	"github.com/cloudfoundry/gosigar"
-	"github.com/docker/containerd/api/grpc/types"
 	"github.com/golang/glog"
 	"github.com/golang/protobuf/ptypes"
+	"github.com/hyperhq/runv/containerd/api/grpc/types"
 	"github.com/hyperhq/runv/supervisor"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"golang.org/x/net/context"