kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Fix CI failure due to conflicting merges

Browse source 
There were two pending PRs with package level
changes but no source level conflicts. This got
merged because git cannot detect this.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
This commit is contained in:
Jana Radhakrishnan 2015-09-07 19:35:39 -07:00
parent 293b811a6c
commit 3528fd9830
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libnetwork/drivers/bridge/bridge_test.go
View file

@ -69,7 +69,7 @@ func TestCreateFullOptions(t *testing.T) {
} }
func TestCreateNoConfig(t *testing.T) { func TestCreateNoConfig(t *testing.T) {
defer osl.SetupTestOSContext(t)() defer testutils.SetupTestOSContext(t)()
d := newDriver() d := newDriver()
netconfig := &networkConfiguration{BridgeName: DefaultBridgeName} netconfig := &networkConfiguration{BridgeName: DefaultBridgeName}