diff options
| author | Jana Radhakrishnan <mrjana@docker.com> | 2015-09-24 18:02:12 -0700 |
|---|---|---|
| committer | Jana Radhakrishnan <mrjana@docker.com> | 2015-09-24 18:02:12 -0700 |
| commit | 51699b91aa5a8a6f535db46692f8ab92170244cb (patch) | |
| tree | b646c1f5f8f2b9c1f2f4313096ad51e12fff752d /libnetwork/default_gateway.go | |
| parent | ffb13d6e8d69db43b5235e164b540a30735ed878 (diff) | |
| parent | a42e5f06632f39d48e5878ec302ea13eb96d9c38 (diff) | |
| download | docker-51699b91aa5a8a6f535db46692f8ab92170244cb.tar.gz | |
Merge pull request #560 from mavenugo/adb
Flip the default for the flag AllowNonDefaultBridge in bridge driver
Diffstat (limited to 'libnetwork/default_gateway.go')
| -rw-r--r-- | libnetwork/default_gateway.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libnetwork/default_gateway.go b/libnetwork/default_gateway.go index 9da982228a..173d926905 100644 --- a/libnetwork/default_gateway.go +++ b/libnetwork/default_gateway.go @@ -94,10 +94,9 @@ func (sb *sandbox) clearDefaultGW() error { func (c *controller) createGWNetwork() (Network, error) { netOption := options.Generic{ - "BridgeName": libnGWNetwork, - "EnableICC": false, - "AllowNonDefaultBridge": true, - "EnableIPMasquerade": true, + "BridgeName": libnGWNetwork, + "EnableICC": false, + "EnableIPMasquerade": true, } n, err := c.NewNetwork("bridge", libnGWNetwork, |