Skip to content

Fix bad merge in agent_test.go#1135

Merged
LK4D4 merged 1 commit intomoby:masterfrom
aaronlehmann:agent-test-bad-merge
Jul 6, 2016
Merged

Fix bad merge in agent_test.go#1135
LK4D4 merged 1 commit intomoby:masterfrom
aaronlehmann:agent-test-bad-merge

Conversation

@aaronlehmann
Copy link
Collaborator

These additions to agent_test.go passed originally, but after being
merged to master, they fail since the behavior has changed. Remove the
newly-added lines causing the failure.

cc @LK4D4 @stevvooe

These additions to agent_test.go passed originally, but after being
merged to master, they fail since the behavior has changed. Remove the
newly-added lines causing the failure.

Signed-off-by: Aaron Lehmann <[email protected]>
@stevvooe
Copy link
Contributor

stevvooe commented Jul 6, 2016

LGTM

2 similar comments
@LK4D4
Copy link
Contributor

LK4D4 commented Jul 6, 2016

LGTM

@abronan
Copy link
Contributor

abronan commented Jul 6, 2016

LGTM

@LK4D4 LK4D4 merged commit 0e11ef5 into moby:master Jul 6, 2016
@aaronlehmann aaronlehmann deleted the agent-test-bad-merge branch July 6, 2016 21:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants