From e802dcd1893618c3f128ce285db10397add2edbd Mon Sep 17 00:00:00 2001
From: Fernandez Ludovic <ludovic@containo.us>
Date: Sun, 11 Jun 2017 19:55:22 +0200
Subject: [PATCH] fix: Mesos/k8s dependency version: golang/glog

`golang/glog` is used by:
- `github.com/mesos/mesos-go` (no version)
- `k8s.io/client-go` (`44145f04b68cf362d9c4df2182967c2275eaefed`)

In #353 (add Mesos provider, 20 Jul 2016), the `golang/glog` hash is `fca8c8854093a154ff1eb580aae10276ad6b1b5f`.

The problem appear in #836 (use k8s client, 1 Dec 2016).

Refs:
- Traefik:
  - https://github.com/containous/traefik/pull/836
  - https://github.com/containous/traefik/commit/131f581f77f2cab53079a624585cd19a88fab0ac
- Glog
  - https://github.com/golang/glog/commits/master
  - https://github.com/golang/glog/pull/13
  - https://github.com/golang/glog/commit/44145f04b68cf362d9c4df2182967c2275eaefed
  - https://github.com/golang/glog/commit/fca8c8854093a154ff1eb580aae10276ad6b1b5f
- k8s
  - https://github.com/kubernetes/client-go/blob/e121606b0d09b2e1c467183ee46217fa85a6b672/Godeps/Godeps.json
  - https://github.com/kubernetes/client-go/blob/master/Godeps/Godeps.json
---
 glide.lock                            | 2 +-
 vendor/github.com/golang/glog/glog.go | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/glide.lock b/glide.lock
index fcb518704..d665c55f4 100644
--- a/glide.lock
+++ b/glide.lock
@@ -226,7 +226,7 @@ imports:
   - proto
   - sortkeys
 - name: github.com/golang/glog
-  version: fca8c8854093a154ff1eb580aae10276ad6b1b5f
+  version: 44145f04b68cf362d9c4df2182967c2275eaefed
 - name: github.com/golang/protobuf
   version: 2bba0603135d7d7f5cb73b2125beeda19c09f4ef
   subpackages:
diff --git a/vendor/github.com/golang/glog/glog.go b/vendor/github.com/golang/glog/glog.go
index 54bd7afdc..3e63fffd5 100644
--- a/vendor/github.com/golang/glog/glog.go
+++ b/vendor/github.com/golang/glog/glog.go
@@ -676,10 +676,7 @@ func (l *loggingT) output(s severity, buf *buffer, file string, line int, alsoTo
 		}
 	}
 	data := buf.Bytes()
-	if !flag.Parsed() {
-		os.Stderr.Write([]byte("ERROR: logging before flag.Parse: "))
-		os.Stderr.Write(data)
-	} else if l.toStderr {
+	if l.toStderr {
 		os.Stderr.Write(data)
 	} else {
 		if alsoToStderr || l.alsoToStderr || s >= l.stderrThreshold.get() {