| Chunk |
|---|
| Conflicting content |
|---|
import java.util.Set; import static org.elasticsearch.cluster.metadata.IndexMetaData.*; <<<<<<< HEAD import static org.elasticsearch.test.ESTestCase.*; ======= import static org.elasticsearch.test.ESTestCase.randomFrom; import static org.elasticsearch.test.ESTestCase.randomIntBetween; >>>>>>> 4a6f3c78408c316d9f6f212d2664adda13c54a44 /** * Helper methods for generating cluster states |
| Solution content |
|---|
import java.util.Set; import static org.elasticsearch.cluster.metadata.IndexMetaData.*; import static org.elasticsearch.test.ESTestCase.*; /** * Helper methods for generating cluster states |
| File |
|---|
| ClusterStateCreationUtils.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |