From: James Forsyth <jf2512@att.com>
Date: Thu, 2 Aug 2018 18:08:25 +0000 (+0000)
Subject: Merge "Updating Search service to be ES 6.1.2 compliant"
X-Git-Tag: 1.3.1~20
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=3f6ec6495e671d0736ed175d5e2915b7ead214c7;hp=8fb6b69f8ddc607d0413dc851f629a2e300e1be9;p=aai%2Fsearch-data-service.git

Merge "Updating Search service to be ES 6.1.2 compliant"
---

diff --git a/src/main/java/org/onap/aai/sa/rest/AnalysisConfiguration.java b/src/main/java/org/onap/aai/sa/rest/AnalysisConfiguration.java
index 97336b6..ecb3f4d 100644
--- a/src/main/java/org/onap/aai/sa/rest/AnalysisConfiguration.java
+++ b/src/main/java/org/onap/aai/sa/rest/AnalysisConfiguration.java
@@ -61,7 +61,7 @@ public class AnalysisConfiguration {
    * all of the custom filters and analyzers that we need Elastic Search
    * to know about.
    */
-  private static String esSettings = null;
+  private String esSettings = null;
 
   private static Logger logger = LoggerFactory.getInstance()
       .getLogger(AnalysisConfiguration.class.getName());