Merge pull request #1059 from hairyhenderson/commands-usage-alphabetize-1014

Sorting commands in alphabetical order
This commit is contained in:
Evan Hazlett 2015-04-27 14:27:12 -07:00
commit c247c7ee9b
1 changed files with 19 additions and 19 deletions

View File

@ -197,6 +197,18 @@ var Commands = []cli.Command{
Usage: "Get or set the active machine", Usage: "Get or set the active machine",
Action: cmdActive, Action: cmdActive,
}, },
{
Name: "config",
Usage: "Print the connection config for machine",
Description: "Argument is a machine name. Will use the active machine if none is provided.",
Action: cmdConfig,
Flags: []cli.Flag{
cli.BoolFlag{
Name: "swarm",
Usage: "Display the Swarm config instead of the Docker daemon",
},
},
},
{ {
Flags: append( Flags: append(
drivers.GetCreateFlags(), drivers.GetCreateFlags(),
@ -207,15 +219,19 @@ var Commands = []cli.Command{
Action: cmdCreate, Action: cmdCreate,
}, },
{ {
Name: "config", Name: "env",
Usage: "Print the connection config for machine", Usage: "Display the commands to set up the environment for the Docker client",
Description: "Argument is a machine name. Will use the active machine if none is provided.", Description: "Argument is a machine name. Will use the active machine if none is provided.",
Action: cmdConfig, Action: cmdEnv,
Flags: []cli.Flag{ Flags: []cli.Flag{
cli.BoolFlag{ cli.BoolFlag{
Name: "swarm", Name: "swarm",
Usage: "Display the Swarm config instead of the Docker daemon", Usage: "Display the Swarm config instead of the Docker daemon",
}, },
cli.BoolFlag{
Name: "unset, u",
Usage: "Unset variables instead of setting them",
},
}, },
}, },
{ {
@ -284,22 +300,6 @@ var Commands = []cli.Command{
Description: "Argument(s) are one or more machine names.", Description: "Argument(s) are one or more machine names.",
Action: cmdRm, Action: cmdRm,
}, },
{
Name: "env",
Usage: "Display the commands to set up the environment for the Docker client",
Description: "Argument is a machine name. Will use the active machine if none is provided.",
Action: cmdEnv,
Flags: []cli.Flag{
cli.BoolFlag{
Name: "swarm",
Usage: "Display the Swarm config instead of the Docker daemon",
},
cli.BoolFlag{
Name: "unset, u",
Usage: "Unset variables instead of setting them",
},
},
},
{ {
Name: "ssh", Name: "ssh",
Usage: "Log into or run a command on a machine with SSH", Usage: "Log into or run a command on a machine with SSH",