Fixed another merge issue

dancannon · dancannon · commit 9c04c10b2e66 · 2015-08-19T18:10:53.000+01:00
diff --git a/cluster.go b/cluster.go
@@ -207,7 +207,7 @@ func (c *Cluster) connectNodes(hosts []Host) {
 			c.opts,
 		)
 		if err != nil {
-			log.Warnf("Error building query %s", err)
+			Log.Warnf("Error building query %s", err)
 			continue
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ func (c *Cluster) connectNodes(hosts []Host) {`
`207`	`207`	`c.opts,`
`208`	`208`	`)`
`209`	`209`	`if err != nil {`
`210`		`- log.Warnf("Error building query %s", err)`
	`210`	`+ Log.Warnf("Error building query %s", err)`
`211`	`211`	`continue`
`212`	`212`	`}`
`213`	`213`