diff options
| author | Areek Zillur <areek.zillur@elasticsearch.com> | 2016-10-12 13:09:29 -0400 |
|---|---|---|
| committer | Areek Zillur <areek.zillur@elasticsearch.com> | 2016-10-12 13:09:29 -0400 |
| commit | 133be6631d66387f4fb3e7977514c40f5e20243c (patch) | |
| tree | 768d2a7ea8cead619363d4dd60ec18d6e436f56c /core/src/test/java/org/elasticsearch/versioning | |
| parent | 481f7909aebec0d73502d61f703ddd8185cb3783 (diff) | |
| parent | 3d3ed7a83a4c7bf4a740ae7e68f39182a120a75f (diff) | |
Merge branch 'master' into cleanup/transport_bulk
Diffstat (limited to 'core/src/test/java/org/elasticsearch/versioning')
| -rw-r--r-- | core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java | 3 | ||||
| -rw-r--r-- | core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java b/core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java index e2c572f783..8edcbd45a8 100644 --- a/core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java +++ b/core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java @@ -32,9 +32,6 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -/** - * - */ public class ConcurrentDocumentOperationIT extends ESIntegTestCase { public void testConcurrentOperationOnSameDoc() throws Exception { logger.info("--> create an index with 1 shard and max replicas based on nodes"); diff --git a/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java b/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java index 2603c3f0c8..ccb392be1f 100644 --- a/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java +++ b/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java @@ -47,9 +47,6 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertThro import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.lessThanOrEqualTo; -/** - * - */ public class SimpleVersioningIT extends ESIntegTestCase { public void testExternalVersioningInitialDelete() throws Exception { createIndex("test"); |