Skip to content

Commit

Permalink
Merge pull request kubernetes#20831 from jonboulle/yifan-gu-bump_rkt
Browse files Browse the repository at this point in the history
Auto commit by PR queue bot
  • Loading branch information
k8s-merge-robot committed Feb 9, 2016
2 parents b98d9a2 + ead87d4 commit b3744a5
Show file tree
Hide file tree
Showing 132 changed files with 6,879 additions and 2,814 deletions.
207 changes: 103 additions & 104 deletions Godeps/Godeps.json

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions Godeps/LICENSES.md

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

1 change: 0 additions & 1 deletion Godeps/_workspace/src/github.com/bradfitz/http2/.gitignore

This file was deleted.

19 changes: 0 additions & 19 deletions Godeps/_workspace/src/github.com/bradfitz/http2/AUTHORS

This file was deleted.

19 changes: 0 additions & 19 deletions Godeps/_workspace/src/github.com/bradfitz/http2/CONTRIBUTORS

This file was deleted.

5 changes: 0 additions & 5 deletions Godeps/_workspace/src/github.com/bradfitz/http2/HACKING

This file was deleted.

7 changes: 0 additions & 7 deletions Godeps/_workspace/src/github.com/bradfitz/http2/LICENSE

This file was deleted.

28 changes: 24 additions & 4 deletions Godeps/_workspace/src/github.com/coreos/etcd/client/client.go

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

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

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

Loading

0 comments on commit b3744a5

Please sign in to comment.