From 9e3ae67423fe38b9bfe7233059431d02ee968804 Mon Sep 17 00:00:00 2001
From: Boaz Leskes <b.leskes@gmail.com>
Date: Thu, 1 Dec 2016 13:15:25 +0100
Subject: [PATCH] HttpClientTests don't override parent tearDown

Original commit: elastic/x-pack-elasticsearch@3cf9f6f352e42db067a4b32d7fb5a413b2df97f3
---
 .../org/elasticsearch/xpack/common/http/HttpClientTests.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpClientTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpClientTests.java
index 539513c7cb0..b8f3bb89196 100644
--- a/elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpClientTests.java
+++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/common/http/HttpClientTests.java
@@ -62,7 +62,7 @@ public class HttpClientTests extends ESTestCase {
     }
 
     @After
-    public void tearDown() throws Exception {
+    public void shutDown() throws Exception {
         webServer.shutdown();
     }