mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2024-01-19 02:48:24 +00:00
Merge branch 'master' into add_volume_follow
This commit is contained in:
Chris Lu
commit
c913583e2d
352
weed/glide.lock
generated
352
weed/glide.lock
generated
|
|
@ -1,352 +0,0 @@
|
|||
hash: 306ab43df769fe8072733ba28c3d2b6308288f248ee65806ac7d0bfa3349ab73
|
||||
updated: 2019-02-25T00:25:56.429024-08:00
|
||||
imports:
|
||||
- name: cloud.google.com/go
|
||||
version: e2c125ceac8b663cfcf4610477d4d67827377cb7
|
||||
subpackages:
|
||||
- compute/metadata
|
||||
- iam
|
||||
- internal
|
||||
- internal/optional
|
||||
- internal/trace
|
||||
- internal/version
|
||||
- pubsub
|
||||
- pubsub/apiv1
|
||||
- pubsub/internal/distribution
|
||||
- storage
|
||||
- name: github.com/aws/aws-sdk-go
|
||||
version: 5604f1add1ce6b18465fd50f7fe8de7561cc8a62
|
||||
subpackages:
|
||||
- aws
|
||||
- aws/awserr
|
||||
- aws/awsutil
|
||||
- aws/client
|
||||
- aws/client/metadata
|
||||
- aws/corehandlers
|
||||
- aws/credentials
|
||||
- aws/credentials/ec2rolecreds
|
||||
- aws/credentials/endpointcreds
|
||||
- aws/credentials/processcreds
|
||||
- aws/credentials/stscreds
|
||||
- aws/csm
|
||||
- aws/defaults
|
||||
- aws/ec2metadata
|
||||
- aws/endpoints
|
||||
- aws/request
|
||||
- aws/session
|
||||
- aws/signer/v4
|
||||
- internal/ini
|
||||
- internal/s3err
|
||||
- internal/sdkio
|
||||
- internal/sdkrand
|
||||
- internal/sdkuri
|
||||
- internal/shareddefaults
|
||||
- private/protocol
|
||||
- private/protocol/eventstream
|
||||
- private/protocol/eventstream/eventstreamapi
|
||||
- private/protocol/query
|
||||
- private/protocol/query/queryutil
|
||||
- private/protocol/rest
|
||||
- private/protocol/restxml
|
||||
- private/protocol/xml/xmlutil
|
||||
- service/s3
|
||||
- service/s3/s3iface
|
||||
- service/sqs
|
||||
- service/sts
|
||||
- name: github.com/Azure/azure-pipeline-go
|
||||
version: 76b57228f36adfbb7e6990ba1347a7fbbf3043da
|
||||
subpackages:
|
||||
- pipeline
|
||||
- name: github.com/Azure/azure-storage-blob-go
|
||||
version: 457680cc0804810f6d02958481e0ffdda51d5c60
|
||||
subpackages:
|
||||
- azblob
|
||||
- name: github.com/boltdb/bolt
|
||||
version: fd01fc79c553a8e99d512a07e8e0c63d4a3ccfc5
|
||||
- name: github.com/chrislusf/raft
|
||||
version: 10d6e2182d923e93ec0cc1aa1d556e5b1f8a39e7
|
||||
subpackages:
|
||||
- protobuf
|
||||
- name: github.com/DataDog/zstd
|
||||
version: 1e382f59b41eebd6f592c5db4fd1958ec38a0eba
|
||||
- name: github.com/davecgh/go-spew
|
||||
version: d8f796af33cc11cb798c1aaeb27a4ebc5099927d
|
||||
subpackages:
|
||||
- spew
|
||||
- name: github.com/dgrijalva/jwt-go
|
||||
version: 3af4c746e1c248ee8491a3e0c6f7a9cd831e95f8
|
||||
- name: github.com/disintegration/imaging
|
||||
version: 5362c131d56305ce787e79a5b94ffc956df00d62
|
||||
- name: github.com/dustin/go-humanize
|
||||
version: 9f541cc9db5d55bce703bd99987c9d5cb8eea45e
|
||||
- name: github.com/eapache/go-resiliency
|
||||
version: 842e16ec2c98ef0c59eebfe60d2d3500a793ba19
|
||||
subpackages:
|
||||
- breaker
|
||||
- name: github.com/eapache/go-xerial-snappy
|
||||
version: 776d5712da21bc4762676d614db1d8a64f4238b0
|
||||
- name: github.com/eapache/queue
|
||||
version: 093482f3f8ce946c05bcba64badd2c82369e084d
|
||||
- name: github.com/fsnotify/fsnotify
|
||||
version: ccc981bf80385c528a65fbfdd49bf2d8da22aa23
|
||||
- name: github.com/go-redis/redis
|
||||
version: bd542089bb6e776e6fced5038edac8a0f526aa53
|
||||
subpackages:
|
||||
- internal
|
||||
- internal/consistenthash
|
||||
- internal/hashtag
|
||||
- internal/pool
|
||||
- internal/proto
|
||||
- internal/util
|
||||
- name: github.com/go-sql-driver/mysql
|
||||
version: 972a708cf97995463843c08c8585b26997daf0e1
|
||||
- name: github.com/gocql/gocql
|
||||
version: ec4793573d1447b6f92a1b359a0594566fad9d0e
|
||||
subpackages:
|
||||
- internal/lru
|
||||
- internal/murmur
|
||||
- internal/streams
|
||||
- name: github.com/golang/protobuf
|
||||
version: c823c79ea1570fb5ff454033735a8e68575d1d0f
|
||||
subpackages:
|
||||
- proto
|
||||
- protoc-gen-go/descriptor
|
||||
- ptypes
|
||||
- ptypes/any
|
||||
- ptypes/duration
|
||||
- ptypes/empty
|
||||
- ptypes/timestamp
|
||||
- name: github.com/golang/snappy
|
||||
version: 2a8bb927dd31d8daada140a5d09578521ce5c36a
|
||||
- name: github.com/google/btree
|
||||
version: 4030bb1f1f0c35b30ca7009e9ebd06849dd45306
|
||||
- name: github.com/googleapis/gax-go
|
||||
version: ddfab93c3faef4935403ac75a7c11f0e731dc181
|
||||
subpackages:
|
||||
- v2
|
||||
- name: github.com/gorilla/mux
|
||||
version: 8559a4f775fc329165fe32bd4c2543de8ada8fce
|
||||
- name: github.com/hailocab/go-hostpool
|
||||
version: e80d13ce29ede4452c43dea11e79b9bc8a15b478
|
||||
- name: github.com/hashicorp/golang-lru
|
||||
version: 20f1fb78b0740ba8c3cb143a61e86ba5c8669768
|
||||
subpackages:
|
||||
- simplelru
|
||||
- name: github.com/hashicorp/hcl
|
||||
version: 65a6292f0157eff210d03ed1bf6c59b190b8b906
|
||||
subpackages:
|
||||
- hcl/ast
|
||||
- hcl/parser
|
||||
- hcl/printer
|
||||
- hcl/scanner
|
||||
- hcl/strconv
|
||||
- hcl/token
|
||||
- json/parser
|
||||
- json/scanner
|
||||
- json/token
|
||||
- name: github.com/jmespath/go-jmespath
|
||||
version: c2b33e8439af944379acbdd9c3a5fe0bc44bd8a5
|
||||
- name: github.com/karlseguin/ccache
|
||||
version: ec06cd93a07565b373789b0078ba88fe697fddd9
|
||||
- name: github.com/klauspost/crc32
|
||||
version: bab58d77464aa9cf4e84200c3276da0831fe0c03
|
||||
- name: github.com/kurin/blazer
|
||||
version: f20ef4f2aa8ccc2e94a1981dc37f199e90fa4ba5
|
||||
subpackages:
|
||||
- b2
|
||||
- base
|
||||
- internal/b2assets
|
||||
- internal/b2types
|
||||
- internal/blog
|
||||
- x/window
|
||||
- name: github.com/lib/pq
|
||||
version: 9eb73efc1fcc404148b56765b0d3f61d9a5ef8ee
|
||||
subpackages:
|
||||
- oid
|
||||
- name: github.com/magiconair/properties
|
||||
version: 7757cc9fdb852f7579b24170bcacda2c7471bb6a
|
||||
- name: github.com/mitchellh/mapstructure
|
||||
version: 3536a929edddb9a5b34bd6861dc4a9647cb459fe
|
||||
- name: github.com/pelletier/go-toml
|
||||
version: 27c6b39a135b7dc87a14afb068809132fb7a9a8f
|
||||
- name: github.com/pierrec/lz4
|
||||
version: 062282ea0dcff40c9fb8525789eef9644b1fbd6e
|
||||
subpackages:
|
||||
- internal/xxh32
|
||||
- name: github.com/rakyll/statik
|
||||
version: 79258177a57a85a8ab2eca7ce0936aad80307f4e
|
||||
subpackages:
|
||||
- fs
|
||||
- name: github.com/rcrowley/go-metrics
|
||||
version: 3113b8401b8a98917cde58f8bbd42a1b1c03b1fd
|
||||
- name: github.com/rwcarlsen/goexif
|
||||
version: b1fd11e07dc5bc0d2ca3b79d28cbdf3c6d186247
|
||||
subpackages:
|
||||
- exif
|
||||
- tiff
|
||||
- name: github.com/satori/go.uuid
|
||||
version: b2ce2384e17bbe0c6d34077efa39dbab3e09123b
|
||||
- name: github.com/seaweedfs/fuse
|
||||
version: 1aae43e32cadcfa182fc60777f20fb02673e8f82
|
||||
subpackages:
|
||||
- fs
|
||||
- fuseutil
|
||||
- name: github.com/Shopify/sarama
|
||||
version: 4602b5a8c6e826f9e0737865818dd43b2339a092
|
||||
- name: github.com/spaolacci/murmur3
|
||||
version: f09979ecbc725b9e6d41a297405f65e7e8804acc
|
||||
- name: github.com/spf13/afero
|
||||
version: f4711e4db9e9a1d3887343acb72b2bbfc2f686f5
|
||||
subpackages:
|
||||
- mem
|
||||
- name: github.com/spf13/cast
|
||||
version: 8c9545af88b134710ab1cd196795e7f2388358d7
|
||||
- name: github.com/spf13/jwalterweatherman
|
||||
version: 94f6ae3ed3bceceafa716478c5fbf8d29ca601a1
|
||||
- name: github.com/spf13/pflag
|
||||
version: 24fa6976df40757dce6aea913e7b81ade90530e1
|
||||
- name: github.com/spf13/viper
|
||||
version: d104d259b3380cb653bb793756823c3c41b37b53
|
||||
- name: github.com/syndtr/goleveldb
|
||||
version: 9d007e481048296f09f59bd19bb7ae584563cd95
|
||||
subpackages:
|
||||
- leveldb
|
||||
- leveldb/cache
|
||||
- leveldb/comparer
|
||||
- leveldb/errors
|
||||
- leveldb/filter
|
||||
- leveldb/iterator
|
||||
- leveldb/journal
|
||||
- leveldb/memdb
|
||||
- leveldb/opt
|
||||
- leveldb/storage
|
||||
- leveldb/table
|
||||
- leveldb/util
|
||||
- name: github.com/willf/bitset
|
||||
version: 20ad246f50b49590afcb1ed8ad143da7163869cb
|
||||
- name: github.com/willf/bloom
|
||||
version: 54e3b963ee1652b06c4562cb9b6020ebc6e36e59
|
||||
- name: go.opencensus.io
|
||||
version: beafb2a85a579a4918ba259877a1625e9213a263
|
||||
subpackages:
|
||||
- exemplar
|
||||
- internal
|
||||
- internal/tagencoding
|
||||
- plugin/ocgrpc
|
||||
- plugin/ochttp
|
||||
- plugin/ochttp/propagation/b3
|
||||
- stats
|
||||
- stats/internal
|
||||
- stats/view
|
||||
- tag
|
||||
- trace
|
||||
- trace/internal
|
||||
- trace/propagation
|
||||
- trace/tracestate
|
||||
- name: golang.org/x/image
|
||||
version: 31aff87c08e9a5e5d524279a564f96968336f886
|
||||
subpackages:
|
||||
- bmp
|
||||
- tiff
|
||||
- tiff/lzw
|
||||
- name: golang.org/x/net
|
||||
version: 3a22650c66bd7f4fb6d1e8072ffd7b75c8a27898
|
||||
subpackages:
|
||||
- context
|
||||
- context/ctxhttp
|
||||
- http/httpguts
|
||||
- http2
|
||||
- http2/hpack
|
||||
- idna
|
||||
- internal/timeseries
|
||||
- trace
|
||||
- name: golang.org/x/oauth2
|
||||
version: 9b3c75971fc92dd27c6436a37c05c831498658f1
|
||||
subpackages:
|
||||
- google
|
||||
- internal
|
||||
- jws
|
||||
- jwt
|
||||
- name: golang.org/x/sync
|
||||
version: 37e7f081c4d4c64e13b10787722085407fe5d15f
|
||||
subpackages:
|
||||
- errgroup
|
||||
- semaphore
|
||||
- name: golang.org/x/text
|
||||
version: 6c92c7dc7f53607809182301b96e4cc1975143f1
|
||||
subpackages:
|
||||
- secure/bidirule
|
||||
- transform
|
||||
- unicode/bidi
|
||||
- unicode/norm
|
||||
- name: golang.org/x/tools
|
||||
version: 83362c3779f5f48611068d488a03ea7bbaddc81e
|
||||
subpackages:
|
||||
- godoc/util
|
||||
- godoc/vfs
|
||||
- name: google.golang.org/api
|
||||
version: 8a550ba84cafabe9b2262c41303f31e5a4626318
|
||||
subpackages:
|
||||
- gensupport
|
||||
- googleapi
|
||||
- googleapi/internal/uritemplates
|
||||
- googleapi/transport
|
||||
- internal
|
||||
- iterator
|
||||
- option
|
||||
- storage/v1
|
||||
- support/bundler
|
||||
- transport
|
||||
- transport/grpc
|
||||
- transport/http
|
||||
- transport/http/internal/propagation
|
||||
- name: google.golang.org/genproto
|
||||
version: 082222b4a5c572e33e82ee9162d1352c7cf38682
|
||||
subpackages:
|
||||
- googleapis/api/annotations
|
||||
- googleapis/iam/v1
|
||||
- googleapis/pubsub/v1
|
||||
- googleapis/rpc/code
|
||||
- googleapis/rpc/status
|
||||
- protobuf/field_mask
|
||||
- name: google.golang.org/grpc
|
||||
version: 2773c7bbcf81cf358d3f0038b1469b2d44062acb
|
||||
subpackages:
|
||||
- balancer
|
||||
- balancer/base
|
||||
- balancer/roundrobin
|
||||
- binarylog/grpc_binarylog_v1
|
||||
- codes
|
||||
- connectivity
|
||||
- credentials
|
||||
- credentials/internal
|
||||
- credentials/oauth
|
||||
- encoding
|
||||
- encoding/proto
|
||||
- grpclog
|
||||
- internal
|
||||
- internal/backoff
|
||||
- internal/binarylog
|
||||
- internal/channelz
|
||||
- internal/envconfig
|
||||
- internal/grpcrand
|
||||
- internal/grpcsync
|
||||
- internal/syscall
|
||||
- internal/transport
|
||||
- keepalive
|
||||
- metadata
|
||||
- naming
|
||||
- peer
|
||||
- reflection
|
||||
- reflection/grpc_reflection_v1alpha
|
||||
- resolver
|
||||
- resolver/dns
|
||||
- resolver/passthrough
|
||||
- stats
|
||||
- status
|
||||
- tap
|
||||
- name: gopkg.in/inf.v0
|
||||
version: d2d2541c53f18d2a059457998ce2876cc8e67cbf
|
||||
- name: gopkg.in/yaml.v2
|
||||
version: 51d6538a90f86fe93ac480b35f37b2be17fef232
|
||||
testImports: []
|
||||
|
|
@ -38,6 +38,7 @@ import:
|
|||
subpackages:
|
||||
- b2
|
||||
- package: github.com/lib/pq
|
||||
- package: github.com/peterh/liner
|
||||
- package: github.com/rakyll/statik
|
||||
subpackages:
|
||||
- fs
|
||||
|
|
@ -54,6 +55,14 @@ import:
|
|||
- leveldb
|
||||
- leveldb/util
|
||||
- package: github.com/willf/bloom
|
||||
- package: gocloud.dev
|
||||
subpackages:
|
||||
- pubsub
|
||||
- pubsub/awssnssqs
|
||||
- pubsub/azuresb
|
||||
- pubsub/gcppubsub
|
||||
- pubsub/natspubsub
|
||||
- pubsub/rabbitpubsub
|
||||
- package: golang.org/x/net
|
||||
subpackages:
|
||||
- context
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ func NewMasterServer(r *mux.Router, port int, metaFolder string,
|
|||
|
||||
if !disableHttp {
|
||||
handleStaticResources2(r)
|
||||
r.HandleFunc("/", ms.uiStatusHandler)
|
||||
r.HandleFunc("/", ms.proxyToLeader(ms.uiStatusHandler))
|
||||
r.HandleFunc("/ui/index.html", ms.uiStatusHandler)
|
||||
r.HandleFunc("/dir/assign", ms.proxyToLeader(ms.guard.WhiteList(ms.dirAssignHandler)))
|
||||
r.HandleFunc("/dir/lookup", ms.proxyToLeader(ms.guard.WhiteList(ms.dirLookupHandler)))
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ var StatusTpl = template.Must(template.New("status").Parse(`<!DOCTYPE html>
|
|||
<td class="col-sm-2 field-label"><label>Other Masters:</label></td>
|
||||
<td class="col-sm-10"><ul class="list-unstyled">
|
||||
{{ range $k, $p := .Peers }}
|
||||
<li><a href="http://{{ $p.Name }}">{{ $p.Name }}</a></li>
|
||||
<li><a href="http://{{ $p.Name }}/ui/index.html">{{ $p.Name }}</a></li>
|
||||
{{ end }}
|
||||
</ul></td>
|
||||
</tr>
|
||||
|
|
|
|||
Loading…
Reference in a new issue