Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry picks for the 1.12.x branch #1573

Merged
merged 12 commits into from
Nov 29, 2016
Merged

Cherry picks for the 1.12.x branch #1573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
efca10d
Allow concurrent calls to agentClose
aboch Nov 1, 2016
c17715b
Increase timeout for local store client
aboch Nov 9, 2016
dc59dfb
Fix new golint reported errors
aboch Nov 15, 2016
e379a9a
Add a nil check for sandbox.osSbox
Nov 15, 2016
4579754
Fix bug in DeleteNeighbor
aboch Nov 15, 2016
8b50ece
Set a timeout on the netlink handle sockets
aboch Nov 15, 2016
506c45a
Respect auto allocation for --ipv6
aboch Nov 4, 2016
39d8abc
Fix bug in needDefaultGW()
aboch Nov 20, 2016
d4cdf89
Serialize embedded resolver Start and Stop
Nov 23, 2016
f3fafdc
Fix bug in link-local unmarshalling
aboch Nov 21, 2016
9d8fd15
Update libkv @1d84310
aboch Nov 24, 2016
381e5fc
Update netlink @17ea11b
aboch Nov 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 19 additions & 20 deletions Godeps/Godeps.json
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Godeps/_workspace/src/github.com/docker/libkv/.travis.yml
View file
Open in desktop

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

6 changes: 0 additions & 6 deletions Godeps/_workspace/src/github.com/docker/libkv/MAINTAINERS
View file
Open in desktop

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

7 changes: 6 additions & 1 deletion Godeps/_workspace/src/github.com/docker/libkv/store/boltdb/boltdb.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion Godeps/_workspace/src/github.com/docker/libkv/store/zookeeper/zookeeper.go
View file
Open in desktop

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

12 changes: 7 additions & 5 deletions Godeps/_workspace/src/github.com/vishvananda/netlink/bpf_linux.go
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Godeps/_workspace/src/github.com/vishvananda/netlink/filter.go
View file
Open in desktop

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

25 changes: 25 additions & 0 deletions Godeps/_workspace/src/github.com/vishvananda/netlink/handle_linux.go
View file
Open in desktop

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

14 changes: 13 additions & 1 deletion Godeps/_workspace/src/github.com/vishvananda/netlink/link.go
View file
Open in desktop

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

Loading