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
  - 131f581f77
- Glog
  - https://github.com/golang/glog/commits/master
  - https://github.com/golang/glog/pull/13
  - 44145f04b6
  - fca8c88540
- k8s
  - e121606b0d/Godeps/Godeps.json
  - https://github.com/kubernetes/client-go/blob/master/Godeps/Godeps.json
This commit is contained in:
Fernandez Ludovic 2017-06-11 19:55:22 +02:00 committed by Ludovic Fernandez
parent 931dc02c09
commit e802dcd189
2 changed files with 2 additions and 5 deletions

2
glide.lock generated
View file

@ -226,7 +226,7 @@ imports:
- proto - proto
- sortkeys - sortkeys
- name: github.com/golang/glog - name: github.com/golang/glog
version: fca8c8854093a154ff1eb580aae10276ad6b1b5f version: 44145f04b68cf362d9c4df2182967c2275eaefed
- name: github.com/golang/protobuf - name: github.com/golang/protobuf
version: 2bba0603135d7d7f5cb73b2125beeda19c09f4ef version: 2bba0603135d7d7f5cb73b2125beeda19c09f4ef
subpackages: subpackages:

View file

@ -676,10 +676,7 @@ func (l *loggingT) output(s severity, buf *buffer, file string, line int, alsoTo
} }
} }
data := buf.Bytes() data := buf.Bytes()
if !flag.Parsed() { if l.toStderr {
os.Stderr.Write([]byte("ERROR: logging before flag.Parse: "))
os.Stderr.Write(data)
} else if l.toStderr {
os.Stderr.Write(data) os.Stderr.Write(data)
} else { } else {
if alsoToStderr || l.alsoToStderr || s >= l.stderrThreshold.get() { if alsoToStderr || l.alsoToStderr || s >= l.stderrThreshold.get() {