Skip to content

Commit

Permalink
Merge pull request #24022 from hongchaodeng/dep
Browse files Browse the repository at this point in the history 
Automatic merge from submit-queue

Bump up etcd dependency to fix data race

ref: #23694

What this PR does
- Bumping up the godep of etcd to fix data race in etcd watcher. Without this change, watcher PR builds will fail in race detection.
- Small changes to fix builds after upgrade
  • Loading branch information
k8s-merge-robot committed Apr 17, 2016
2 parents 9e7ed22 + 3c2c906 commit 5f3f06f
Show file tree
Hide file tree
Showing 179 changed files with 9,582 additions and 3,527 deletions.
149 changes: 77 additions & 72 deletions Godeps/Godeps.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

1 comment on commit 5f3f06f

@k8s-teamcity-mesosphere
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity OSS :: Kubernetes Mesos :: 4 - Smoke Tests Build 21645 outcome was FAILURE
Summary: Exit code 1 Build time: 00:25:52

Please sign in to comment.