mirror of
https://github.com/honeymoose/OpenSearch.git
synced 2025-02-10 15:05:33 +00:00
Conflicts: core/src/main/java/org/elasticsearch/env/Environment.java core/src/test/java/org/elasticsearch/index/analysis/commongrams/CommonGramsTokenFilterFactoryTests.java core/src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTest.java plugins/analysis-kuromoji/src/test/java/org/elasticsearch/index/analysis/KuromojiAnalysisTests.java