Projects >> elasticsearch >>6819224d2c541f7482050679250c7d98c005dfeb

Chunk
Conflicting content 
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.atomic.AtomicLong;

<<<<<<< HEAD
=======
import static java.util.Collections.unmodifiableMap;
import static org.elasticsearch.common.Strings.hasLength;
>>>>>>> 362713a4f95a30d6602d65d4e59eeed0fe142506
import static org.elasticsearch.common.unit.TimeValue.timeValueMillis;
import static org.elasticsearch.common.unit.TimeValue.timeValueMinutes;
Solution content 
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.atomic.AtomicLong;

import static java.util.Collections.unmodifiableMap;
import static org.elasticsearch.common.Strings.hasLength;
import static org.elasticsearch.common.unit.TimeValue.timeValueMillis;
import static org.elasticsearch.common.unit.TimeValue.timeValueMinutes;
File
SearchService.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
package org.elasticsearch.cluster;

import com.carrotsearch.hppc.cursors.ObjectCursor;
<<<<<<< HEAD
import com.google.common.collect.ImmutableMap;
=======
>>>>>>> 362713a4f95a30d6602d65d4e59eeed0fe142506
import org.elasticsearch.Version;
import org.elasticsearch.cluster.block.ClusterBlock;
Solution content 
package org.elasticsearch.cluster;

import com.carrotsearch.hppc.cursors.ObjectCursor;

import org.elasticsearch.Version;
import org.elasticsearch.cluster.block.ClusterBlock;
File
ClusterStateDiffIT.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
package org.elasticsearch.search.fetch;

<<<<<<< HEAD
import com.google.common.collect.ImmutableMap;

=======
>>>>>>> 362713a4f95a30d6602d65d4e59eeed0fe142506
import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.util.BytesRef;
Solution content 
package org.elasticsearch.search.fetch;


import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.util.BytesRef;
File
FetchSubPhasePluginIT.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import org.elasticsearch.action.termvectors.TermVectorsRequest;
import org.elasticsearch.action.termvectors.TermVectorsResponse;
import org.elasticsearch.common.Priority;
<<<<<<< HEAD
import org.elasticsearch.common.xcontent.XContentBuilder;
=======
import org.elasticsearch.common.bytes.BytesArray;
>>>>>>> 362713a4f95a30d6602d65d4e59eeed0fe142506
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.search.SearchHitField;
Solution content 
import org.elasticsearch.action.termvectors.TermVectorsRequest;
import org.elasticsearch.action.termvectors.TermVectorsResponse;
import org.elasticsearch.common.Priority;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.search.SearchHitField;
File
FetchSubPhasePluginIT.java
Developer's decision
Version 1
Kind of conflict
Import