node rm can be applied on not only active node

Signed-off-by: allencloud <allen.sun@daocloud.io>
This commit is contained in:
allencloud 2016-11-02 17:22:04 +08:00
parent bcdce2a6b0
commit 002262d6f5
6 changed files with 6 additions and 6 deletions

View File

@ -6176,7 +6176,7 @@ paths:
required: true required: true
- name: "force" - name: "force"
in: "query" in: "query"
description: "Force remove an active node" description: "Force remove a node from the swarm"
default: false default: false
type: "boolean" type: "boolean"
tags: tags:

View File

@ -29,7 +29,7 @@ func newRemoveCommand(dockerCli *command.DockerCli) *cobra.Command {
}, },
} }
flags := cmd.Flags() flags := cmd.Flags()
flags.BoolVar(&opts.force, "force", false, "Force remove an active node") flags.BoolVar(&opts.force, "force", false, "Force remove a node from the swarm")
return cmd return cmd
} }

View File

@ -818,7 +818,7 @@ __docker_node_subcommand() {
(rm|remove) (rm|remove)
_arguments $(__docker_arguments) \ _arguments $(__docker_arguments) \
$opts_help \ $opts_help \
"($help)--force[Force remove an active node]" \ "($help)--force[Force remove a node from the swarm]" \
"($help -)*:node:__docker_complete_pending_nodes" && ret=0 "($help -)*:node:__docker_complete_pending_nodes" && ret=0
;; ;;
(demote) (demote)

View File

@ -4064,7 +4064,7 @@ Remove a node [`id`] from the swarm.
**Query parameters**: **Query parameters**:
- **force** - 1/True/true or 0/False/false, Force remove an active node. - **force** - 1/True/true or 0/False/false, Force remove a node from the swarm.
Default `false`. Default `false`.
**Status codes**: **Status codes**:

View File

@ -4589,7 +4589,7 @@ Remove a node [`id`] from the swarm.
**Query parameters**: **Query parameters**:
- **force** - 1/True/true or 0/False/false, Force remove an active node. - **force** - 1/True/true or 0/False/false, Force remove a node from the swarm.
Default `false`. Default `false`.
**Status codes**: **Status codes**:

View File

@ -24,7 +24,7 @@ Aliases:
rm, remove rm, remove
Options: Options:
--force Force remove an active node --force Force remove a node from the swarm
--help Print usage --help Print usage
``` ```