From 3528fd9830cae0c3205dec45c6751a178fb08070 Mon Sep 17 00:00:00 2001 From: Jana Radhakrishnan Date: Mon, 7 Sep 2015 19:35:39 -0700 Subject: [PATCH] Fix CI failure due to conflicting merges 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 --- libnetwork/drivers/bridge/bridge_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnetwork/drivers/bridge/bridge_test.go b/libnetwork/drivers/bridge/bridge_test.go index d2aa2e34ca..a962d33395 100644 --- a/libnetwork/drivers/bridge/bridge_test.go +++ b/libnetwork/drivers/bridge/bridge_test.go @@ -69,7 +69,7 @@ func TestCreateFullOptions(t *testing.T) { } func TestCreateNoConfig(t *testing.T) { - defer osl.SetupTestOSContext(t)() + defer testutils.SetupTestOSContext(t)() d := newDriver() netconfig := &networkConfiguration{BridgeName: DefaultBridgeName}