mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1755 from bcwaldon/golang.org-deps

Browse Source 
Switch to golang.org/x/net/context
This commit is contained in:
Brian Waldon
2014-11-20 16:26:14 -08:00
parent 5139257b8d da5538b8c7
commit c0fb1c8a00
27 changed files with 43 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
etcdserver/server.go
View File

@ -31,7 +31,7 @@ import (
"sync/atomic"
"time"
"github.com/coreos/etcd/Godeps/_workspace/src/code.google.com/p/go.net/context"
"github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context"
"github.com/coreos/etcd/discovery"
"github.com/coreos/etcd/etcdserver/etcdhttp/httptypes"
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"