From e3816d58aeb8ee750e0ada6ac97f379b7f3578b3 Mon Sep 17 00:00:00 2001
From: Ali Beyad <ali@elastic.co>
Date: Thu, 28 Jan 2016 17:10:04 -0500
Subject: [PATCH] TribeIT.testOnConflictDrop test awaits fix until #16299 is
 resolved

---
 core/src/test/java/org/elasticsearch/tribe/TribeIT.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/test/java/org/elasticsearch/tribe/TribeIT.java b/core/src/test/java/org/elasticsearch/tribe/TribeIT.java
index 260c6252efd..506321684ba 100644
--- a/core/src/test/java/org/elasticsearch/tribe/TribeIT.java
+++ b/core/src/test/java/org/elasticsearch/tribe/TribeIT.java
@@ -225,6 +225,7 @@ public class TribeIT extends ESIntegTestCase {
         }
     }
 
+    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/16299")
     public void testOnConflictDrop() throws Exception {
         logger.info("create 2 indices, test1 on t1, and test2 on t2");
         assertAcked(cluster().client().admin().indices().prepareCreate("conflict"));