Projects >> elasticsearch >>c0444ccbc6a783e5a9363d0e99dba8aa400dca38

Chunk
Conflicting content 
    @Override
    protected Settings nodeSettings(int nodeOrdinal) {
        return settingsBuilder().put(super.nodeSettings(nodeOrdinal))
<<<<<<< HEAD
            .extendArray("plugin.types", MockRepository.Plugin.class.getName()).build();
=======
                // Rebalancing is causing some checks after restore to randomly fail
                // due to https://github.com/elastic/elasticsearch/issues/9421
                .put(EnableAllocationDecider.CLUSTER_ROUTING_REBALANCE_ENABLE, EnableAllocationDecider.Rebalance.NONE)
                .extendArray("plugin.types", MockRepositoryPlugin.class.getName()).build();
>>>>>>> 5496a504e284dbf13f8ae736d231de03bd65382e
    }

    public static long getFailureCount(String repository) {
Solution content 
    @Override
    protected Settings nodeSettings(int nodeOrdinal) {
        return settingsBuilder().put(super.nodeSettings(nodeOrdinal))
            // Rebalancing is causing some checks after restore to randomly fail
            // due to https://github.com/elastic/elasticsearch/issues/9421
            .put(EnableAllocationDecider.CLUSTER_ROUTING_REBALANCE_ENABLE, EnableAllocationDecider.Rebalance.NONE)
            .extendArray("plugin.types", MockRepository.Plugin.class.getName()).build();
    }

    public static long getFailureCount(String repository) {
File
AbstractSnapshotIntegTestCase.java
Developer's decision
Combination
Kind of conflict
Comment
Method invocation