resolve merge conflict and update test cases

This commit is contained in:
Jeremy Long
2017-09-30 07:27:44 -04:00
8 changed files with 98 additions and 12 deletions

View File

@@ -253,6 +253,10 @@ public final class Settings {
* The properties key for whether experimental analyzers are loaded.
*/
public static final String ANALYZER_EXPERIMENTAL_ENABLED = "analyzer.experimental.enabled";
/**
* The properties key for whether experimental analyzers are loaded.
*/
public static final String ANALYZER_RETIRED_ENABLED = "analyzer.retired.enabled";
/**
* The properties key for whether the Archive analyzer is enabled.
*/