Skip to content

Swarm branch, picking other prs #796

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.

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

Merged
merged 3 commits into from
Feb 14, 2017
Merged

Conversation

KostyaSha
Copy link
Member

@KostyaSha KostyaSha commented Feb 13, 2017

can't squash merge because it will lost gh contribution for people


This change is Reviewable

Apply changes from review

Remove unused import

Fix compile errors
@KostyaSha
Copy link
Member Author

@Yogu what PRs are correct? I see Swarm and SwarmNode class naming

@KostyaSha
Copy link
Member Author

KostyaSha commented Feb 14, 2017

#673 #678 #686

martin894 and others added 2 commits February 14, 2017 23:12
Add ListNodes implementation

Fix error in ListNodesCmdExec

Add FilterBuilder for swarmNodes, renamed Node to SwarmNode

Update model classes for SwarmNodes

add implementation for update,list,remove and inspect of a swarmNode

Update model classes for docker-swarm-node

Add methods for swarmNode to execFactories
Fix service tests

Add missing withDriver() method

Fix json name of Networks in ServiceSpec

Add tests to add network to services

Do not fail on empty beans
@KostyaSha KostyaSha merged commit 4da8b8c into docker-java:swarm Feb 14, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants