Merge pull request redis#1043 from ramonberrutti/sentinel_password

add option for sentinel password

sentinel.go

@@ -28,8 +28,9 @@ type FailoverOptions struct {
 	Dialer    func(network, addr string) (net.Conn, error)
 	OnConnect func(*Conn) error
 
-	Password string
-	DB       int
+	Password         string
+	SentinelPassword string
+	DB               int
 
 	MaxRetries      int
 	MinRetryBackoff time.Duration
@@ -83,6 +84,7 @@ func NewFailoverClient(failoverOpt *FailoverOptions) *Client {
 	failover := &sentinelFailover{
 		masterName:    failoverOpt.MasterName,
 		sentinelAddrs: failoverOpt.SentinelAddrs,
+		password:      failoverOpt.SentinelPassword,
 
 		opt: opt,
 	}
@@ -280,7 +282,8 @@ func (c *SentinelClient) Remove(name string) *StringCmd {
 type sentinelFailover struct {
 	sentinelAddrs []string
 
-	opt *Options
+	opt      *Options
+	password string
 
 	pool     *pool.ConnPool
 	poolOnce sync.Once
@@ -339,6 +342,8 @@ func (c *sentinelFailover) masterAddr() (string, error) {
 		sentinel := NewSentinelClient(&Options{
 			Addr: sentinelAddr,
 
+			Password: c.password,
+
 			MaxRetries: c.opt.MaxRetries,
 
 			DialTimeout:  c.opt.DialTimeout,