[TEST] muste test and add issue number

This commit is contained in:
Britta Weber 2015-03-27 17:35:38 +01:00
parent 6181d8ecde
commit ccf5482956
1 changed files with 2 additions and 0 deletions

View File

@ -19,6 +19,7 @@
package org.elasticsearch.index.mapper.update;
import org.apache.lucene.util.LuceneTestCase;
import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse;
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse;
import org.elasticsearch.client.Client;
@ -204,6 +205,7 @@ public class UpdateMappingOnClusterTests extends ElasticsearchIntegrationTest {
}
@Test
@LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/10297")
public void testTimestampMergingConflicts() throws Exception {
String mapping = XContentFactory.jsonBuilder().startObject().startObject(TYPE)
.startObject("_timestamp").field("enabled", true)