Skip to content

Commit

Permalink
Merge pull request #2414 from lemrouch/2413-fix
Browse files Browse the repository at this point in the history
Allow network with --config-from to be --internal
  • Loading branch information
selansen authored Jul 15, 2019
2 parents 4f86de7 + f1df445 commit 3fb133e
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -801,6 +801,7 @@ func (c *controller) NewNetwork(networkType, name string, id string, options ...
if err = t.applyConfigurationTo(network); err != nil {
return nil, types.InternalErrorf("Failed to apply configuration: %v", err)
}
network.generic[netlabel.Internal] = network.internal
defer func() {
if err == nil {
if err := t.getEpCnt().IncEndpointCnt(); err != nil {
Expand Down

0 comments on commit 3fb133e

Please sign in to comment.