diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2021-12-07 10:52:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-07 10:52:59 +0100 |
| commit | e2818c4593f6964e57bdbd332ebe0481d39bb0d8 (patch) | |
| tree | 4600fb1421e42e02a5d57b66cf216553ab4af4bc | |
| parent | 09bd9d8aa645771b9552a4cac75e654e122fce67 (diff) | |
| parent | 9c14b56349c50b3a15efe733fc0727d831fe89f7 (diff) | |
Merge pull request #20395 from vespa-engine/bjorncs/deprecate-guava-public-apis
Fix javadoc MERGEOK
| -rw-r--r-- | vespajlib/src/main/java/com/yahoo/concurrent/CompletableFutures.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/CompletableFutures.java b/vespajlib/src/main/java/com/yahoo/concurrent/CompletableFutures.java index 35506ec4512..125f909f0c2 100644 --- a/vespajlib/src/main/java/com/yahoo/concurrent/CompletableFutures.java +++ b/vespajlib/src/main/java/com/yahoo/concurrent/CompletableFutures.java @@ -71,7 +71,7 @@ public class CompletableFutures { } /** - * Helper for migrating from {@link ListenableFuture} to {@link CompletableFuture> in Vespa public apis + * Helper for migrating from {@link ListenableFuture} to {@link CompletableFuture} in Vespa public apis * @deprecated to be removed in Vespa 8 */ @Deprecated(forRemoval = true, since = "7") @@ -86,7 +86,7 @@ public class CompletableFutures { } /** - * Helper for migrating from {@link ListenableFuture} to {@link CompletableFuture> in Vespa public apis + * Helper for migrating from {@link ListenableFuture} to {@link CompletableFuture} in Vespa public apis * @deprecated to be removed in Vespa 8 */ @Deprecated(forRemoval = true, since = "7") |