From 2c3a0db9ecc7fb0cda59fd8bc9375bfed95074e8 Mon Sep 17 00:00:00 2001 From: Chris Earle Date: Wed, 13 Jul 2016 14:56:37 -0400 Subject: [PATCH] [Watcher] Fix typoed deprecated endpoint {actions/_ack was accidentally duplicated. It should be _ack/{actions} in the first case. Original commit: elastic/x-pack-elasticsearch@38895522b538102bdc726ee303cff0ae55aac5de --- .../xpack/watcher/rest/action/RestAckWatchAction.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestAckWatchAction.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestAckWatchAction.java index 3ea0862a412..82d20a02f28 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestAckWatchAction.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestAckWatchAction.java @@ -39,9 +39,9 @@ public class RestAckWatchAction extends WatcherRestHandler { controller.registerWithDeprecatedHandler(PUT, URI_BASE + "/watch/{id}/_ack", this, PUT, "/_watcher/watch/{id}/_ack", deprecationLogger); controller.registerWithDeprecatedHandler(POST, URI_BASE + "/watch/{id}/_ack/{actions}", this, - POST, "/_watcher/watch/{id}/{actions}/_ack", deprecationLogger); + POST, "/_watcher/watch/{id}/_ack/{actions}", deprecationLogger); controller.registerWithDeprecatedHandler(PUT, URI_BASE + "/watch/{id}/_ack/{actions}", this, - PUT, "/_watcher/watch/{id}/{actions}/_ack", deprecationLogger); + PUT, "/_watcher/watch/{id}/_ack/{actions}", deprecationLogger); // @deprecated The following can be totally dropped in 6.0 // Note: we deprecated "/{actions}/_ack" totally; so we don't replace it with a matching _xpack variant