diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-12-18 14:52:55 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-12-18 14:52:55 +0100 |
| commit | e26d4e467b87ab980fbbb5792f7444985e55edaf (patch) | |
| tree | 52f41de4cfb61005960f18656adde7f2a71518c8 | |
| parent | ac8ad2a02e1c1c284c4fba3979a91311ed938d07 (diff) | |
| parent | e786649b0fbca43d7fc8def3502c27ac4d3ea870 (diff) | |
| download | mullvadvpn-e26d4e467b87ab980fbbb5792f7444985e55edaf.tar.xz mullvadvpn-e26d4e467b87ab980fbbb5792f7444985e55edaf.zip | |
Merge branch 'fix-update-relay-locations-type'
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | mullvad-ipc-client/src/lib.rs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index cb53249f2d..c064995d42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,7 @@ Line wrap the file at 100 chars. Th ### Fixed - Stop GUI from glitching during the short reconnect state. - Dismiss notifications automatically after four seconds in all platforms. +- Fix error printed from the CLI when issuing `relay update`. ## [2018.6-beta1] - 2018-12-05 diff --git a/mullvad-ipc-client/src/lib.rs b/mullvad-ipc-client/src/lib.rs index e04f86e4bf..066bd8250d 100644 --- a/mullvad-ipc-client/src/lib.rs +++ b/mullvad-ipc-client/src/lib.rs @@ -160,7 +160,7 @@ impl DaemonRpcClient { self.call("get_relay_locations", &NO_ARGS) } - pub fn update_relay_locations(&mut self) -> Result<RelayList> { + pub fn update_relay_locations(&mut self) -> Result<()> { self.call("update_relay_locations", &NO_ARGS) } |