diff options
| author | chrislusf <chris.lu@gmail.com> | 2014-12-26 01:29:30 -0800 |
|---|---|---|
| committer | chrislusf <chris.lu@gmail.com> | 2014-12-26 01:29:30 -0800 |
| commit | 763f5e16c7238b8e4b30ea60560212fb927a8873 (patch) | |
| tree | ec86ea79cb296d838a5d8eaa71ec7a30705e6d90 /go/weed | |
| parent | 8651f7c7276042332fb3edf545f7a7a3af3e0dec (diff) | |
| parent | 5b7628cf08b246bb8dd075a28f29e1bd3401eb2d (diff) | |
| download | seaweedfs-763f5e16c7238b8e4b30ea60560212fb927a8873.tar.xz seaweedfs-763f5e16c7238b8e4b30ea60560212fb927a8873.zip | |
Merge pull request #38 from aszxqw/master
fix
Diffstat (limited to 'go/weed')
| -rw-r--r-- | go/weed/weed_server/master_server_handlers_admin.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/go/weed/weed_server/master_server_handlers_admin.go b/go/weed/weed_server/master_server_handlers_admin.go index d7124e567..75e059365 100644 --- a/go/weed/weed_server/master_server_handlers_admin.go +++ b/go/weed/weed_server/master_server_handlers_admin.go @@ -8,12 +8,12 @@ import ( "strconv" "strings" - proto "code.google.com/p/goprotobuf/proto" "github.com/chrislusf/weed-fs/go/glog" "github.com/chrislusf/weed-fs/go/operation" "github.com/chrislusf/weed-fs/go/storage" "github.com/chrislusf/weed-fs/go/topology" "github.com/chrislusf/weed-fs/go/util" + "github.com/golang/protobuf/proto" ) func (ms *MasterServer) collectionDeleteHandler(w http.ResponseWriter, r *http.Request) { |