Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix linting error #2845

Merged
merged 1 commit into from
May 3, 2019
Merged

Fix linting error #2845

merged 1 commit into from
May 3, 2019

Conversation

thaJeztah
Copy link
Member

Fixes;

manager/allocator/network.go:186::error: Entry.Errorf format %s has arg nc.ingressNetwork.Spec.Annotations of wrong type github.com/docker/swarmkit/api.Annotations (vet)

@thaJeztah
Fix linting error
2ca921b 
Fixes;

    manager/allocator/network.go:186::error: Entry.Errorf format %s has arg nc.ingressNetwork.Spec.Annotations of wrong type github.com/docker/swarmkit/api.Annotations (vet)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Member Author

rebased to kick CI

@thaJeztah
Copy link
Member Author

boooh

--- FAIL: TestServiceRemoveUnassignedTasks (1.01s)
	Error Trace:	testutils.go:57
			task_reaper_test.go:1057
	Error:		no task deletion

@codecov
Copy link

codecov bot commented Apr 12, 2019

Codecov Report

Merging #2845 into master will decrease coverage by 0.08%.
The diff coverage is 0%.

@@            Coverage Diff             @@
##           master    #2845      +/-   ##
==========================================
- Coverage   62.17%   62.09%   -0.09%     
==========================================
  Files         139      139              
  Lines       22314    22314              
==========================================
- Hits        13874    13855      -19     
- Misses       6970     6986      +16     
- Partials     1470     1473       +3

@thaJeztah
Copy link
Member Author

ping @dperny ptal

@dperny dperny merged commit cebbe53 into moby:master May 3, 2019
@thaJeztah thaJeztah deleted the fix_linting_error branch May 3, 2019 23:35
dperny added a commit to dperny/docker that referenced this pull request May 24, 2019
@dperny
Bump swarmkit vendoring
67e25ec 
Includes the following changes since last vendoring:

moby/swarmkit#2795 - Add capabilities list to container specification
moby/swarmkit#2845 - Fix linting error
moby/swarmkit#2848 - Bump fernet/fernet-go
moby/swarmkit#2856 - Add ListServiceStatuses grpc method
moby/swarmkit#2857 - Use Service Placement Constraints in Enforcer

Signed-off-by: Drew Erny <drew.erny@docker.com>
@dperny dperny mentioned this pull request May 24, 2019
Merged
docker-jenkins pushed a commit to docker-archive/docker-ce that referenced this pull request May 26, 2019
@dperny
Bump swarmkit vendoring
b15fbc6 
Includes the following changes since last vendoring:

moby/swarmkit#2795 - Add capabilities list to container specification
moby/swarmkit#2845 - Fix linting error
moby/swarmkit#2848 - Bump fernet/fernet-go
moby/swarmkit#2856 - Add ListServiceStatuses grpc method
moby/swarmkit#2857 - Use Service Placement Constraints in Enforcer

Signed-off-by: Drew Erny <drew.erny@docker.com>
Upstream-commit: 67e25ec5ac568a893e444891a6a583fd2f996f76
Component: engine
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wk8 wk8 wk8 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@thaJeztah @wk8 @dperny