Merge pull request #15261 from LK4D4/fix_fluentd_vendor

Fix vendoring for fluent-logger-golang
2015-08-03 16:13:05 -07:00 · 2015-08-03 16:13:05 -07:00 · 8d3bc4b98c
parent 40bd10dc95 ef7bb7242f
commit 8d3bc4b98c
2 changed files with 3 additions and 2 deletions
--- a/vendor/src/github.com/fluent/fluent-logger-golang/fluent/fluent.go
+++ b/vendor/src/github.com/fluent/fluent-logger-golang/fluent/fluent.go
@ -3,6 +3,7 @@ package fluent
 import (
 	"errors"
 	"fmt"
+	"io"
 	"math"
 	"net"
 	"reflect"
@ -33,7 +34,7 @@ type Config struct {

 type Fluent struct {
 	Config
-	conn         net.Conn
+	conn         io.WriteCloser
 	pending      []byte
 	reconnecting bool
 	mu           sync.Mutex
--- a/vendor/src/github.com/fluent/fluent-logger-golang/fluent/version.go
+++ b/vendor/src/github.com/fluent/fluent-logger-golang/fluent/version.go
@ -1,3 +1,3 @@
 package fluent

-const Version = "0.5.1"
+const Version = "1.0.0"