diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2018-08-15 11:48:33 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2018-08-15 11:48:33 -0300 |
| commit | e84e87f4ce5a8c242f756566cdc6fb59a45f7bea (patch) | |
| tree | e156893340aa0ae4ab6576b71c268f9dc90468d5 | |
| parent | bcd21a7e071b2766c5645fb699570551a8fd42bb (diff) | |
| parent | 213be1cf6faec4779b41d6fc64f7f8470c463ff8 (diff) | |
| download | mullvadvpn-e84e87f4ce5a8c242f756566cdc6fb59a45f7bea.tar.xz mullvadvpn-e84e87f4ce5a8c242f756566cdc6fb59a45f7bea.zip | |
Merge branch 'simplify-cli-relay-list-command'
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | mullvad-cli/src/cmds/relay.rs | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a91ed2c011..6d3cd05eef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,8 @@ Line wrap the file at 100 chars. Th ### Changed - The "Buy more credit" button is changed to open a dedicated account login page instead of one having a create account form first. +- The CLI command to list relays is now shorter, `mullvad relay list` instead of + `mullvad relay list locations`. ## [2018.2] - 2018-08-13 diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs index 2bdf84f40a..5be05786cc 100644 --- a/mullvad-cli/src/cmds/relay.rs +++ b/mullvad-cli/src/cmds/relay.rs @@ -82,12 +82,7 @@ impl Command for Relay { ), ).subcommand(clap::SubCommand::with_name("get")) .subcommand( - clap::SubCommand::with_name("list") - .setting(clap::AppSettings::SubcommandRequired) - .subcommand( - clap::SubCommand::with_name("locations") - .about("List available countries and cities"), - ), + clap::SubCommand::with_name("list").about("List available countries and cities"), ) } |