Merge branch 'master' into index-lifecycle

This commit is contained in:
Colin Goodheart-Smithe 2018-01-03 10:21:50 +00:00
parent 6a47b4fa6e
commit 33afe0f012
1 changed files with 2 additions and 2 deletions

View File

@ -11,8 +11,8 @@ import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.license.XPackLicenseState; import org.elasticsearch.license.XPackLicenseState;
import org.elasticsearch.xpack.XPackFeatureSet; import org.elasticsearch.xpack.XPackFeatureSet;
import org.elasticsearch.xpack.XPackPlugin;
import org.elasticsearch.xpack.XPackSettings; import org.elasticsearch.xpack.XPackSettings;
import org.elasticsearch.xpack.XpackField;
import java.util.Map; import java.util.Map;
@ -29,7 +29,7 @@ public class IndexLifecycleFeatureSet implements XPackFeatureSet {
@Override @Override
public String name() { public String name() {
return XPackPlugin.INDEX_LIFECYCLE; return XpackField.INDEX_LIFECYCLE;
} }
@Override @Override