Merge branch 'master' into cache

This commit is contained in:
Asim 2016-04-26 18:53:39 +01:00
commit 1152b63c5d

View File

@ -24,7 +24,6 @@ import (
// selectors // selectors
"github.com/micro/go-micro/selector" "github.com/micro/go-micro/selector"
"github.com/micro/go-micro/selector/blacklist" "github.com/micro/go-micro/selector/blacklist"
"github.com/micro/go-micro/selector/cache"
"github.com/micro/go-micro/selector/random" "github.com/micro/go-micro/selector/random"
"github.com/micro/go-micro/selector/roundrobin" "github.com/micro/go-micro/selector/roundrobin"
@ -142,7 +141,6 @@ var (
} }
DefaultSelectors = map[string]func(...selector.Option) selector.Selector{ DefaultSelectors = map[string]func(...selector.Option) selector.Selector{
"cache": cache.NewSelector,
"random": random.NewSelector, "random": random.NewSelector,
"roundrobin": roundrobin.NewSelector, "roundrobin": roundrobin.NewSelector,
"blacklist": blacklist.NewSelector, "blacklist": blacklist.NewSelector,