Merge commit '7e9256b39e4681bc23c53f2a5a0779f7b3308bc7' into release-1.2

kubernetes · Mar 8, 2016 · 4bf9bcc · 4bf9bcc
2 parents 50f7568 + 7e9256b
commit 4bf9bcc
Show file tree

Hide file tree

Showing 403 changed files with 11,976 additions and 29,816 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/auth/sasl/mock/mock.go b/Godeps/_workspace/src/github.com/mesos/mesos-go/auth/sasl/mock/mock.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/detector/factory.go b/Godeps/_workspace/src/github.com/mesos/mesos-go/detector/factory.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/detector/interface.go b/Godeps/_workspace/src/github.com/mesos/mesos-go/detector/interface.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/detector/zoo/client2.go b/Godeps/_workspace/src/github.com/mesos/mesos-go/detector/zoo/client2.go
diff --git a/Godeps/_workspace/src/github.com/mesos/mesos-go/detector/zoo/detect.go b/Godeps/_workspace/src/github.com/mesos/mesos-go/detector/zoo/detect.go
diff --git a/...esos/mesos-go/detector/zoo/mocked_conn.go → .../mesos/mesos-go/detector/zoo/mock/conn.go b/...esos/mesos-go/detector/zoo/mocked_conn.go → .../mesos/mesos-go/detector/zoo/mock/conn.go