Michael Crosby 28336d95ca Merge pull request #26659 from yongtang/26341-fixed-cidr-multiple-addresses-bridge ...

Fix issue for `--fixed-cidr` when bridge has multiple addresses
Upstream-commit: 1e989abefba1a424b95d3fc1474e489ace747598
Component: engine

2016-10-28 11:05:01 -07:00

..

dockerfile

Build docker-proxy from git checkout like other external binaries

2016-10-25 13:13:22 +01:00

Jenkins

Update win2lin scripts to match production

2016-06-08 11:08:23 -07:00

make

Merge pull request #27735 from justincormack/completions-tgz

2016-10-25 15:46:45 -07:00

.vendor-helpers.sh

Build docker-proxy from git checkout like other external binaries

2016-10-25 13:13:22 +01:00

dind

Update dind

2016-05-24 20:42:28 -07:00

generate-authors.sh

Move scripts back to hack/, leave docs in project/

2015-03-13 14:04:08 -06:00

generate-swagger-api.sh

Generate plugin types from the swagger spec.

2016-10-20 13:24:23 -07:00

install.sh

Merge pull request #27005 from lizzha/azurechina

2016-10-11 13:04:11 -07:00

make.sh

Merge pull request #27519 from justincormack/proxy-build

2016-10-25 08:54:13 -07:00

release.sh

Remove amd64 assumption in release.sh, cross and tgz scripts

2016-10-03 15:46:42 -07:00

vendor.sh

Merge pull request #26659 from yongtang/26341-fixed-cidr-multiple-addresses-bridge

2016-10-28 11:05:01 -07:00