Merge branch 'stable-2.14'

* stable-2.14: Remove 'flaky' tag from elasticsearch tests Change-Id: I2fa2a788584fa266d53d0c2f13ce2c2b896b2501
2017-04-28 13:52:39 +02:00 · 2017-04-28 13:52:39 +02:00 · ef7e791d4d
parent 7c92cf2ada 0fcb6ac40b
commit ef7e791d4d
1 changed files with 0 additions and 2 deletions
--- a/gerrit-elasticsearch/BUILD
+++ b/gerrit-elasticsearch/BUILD
@ -52,10 +52,8 @@ junit_tests(
    name = "elasticsearch_tests",
    size = "large",
    srcs = glob(["src/test/java/**/*Test.java"]),
-    flaky = 1,
    tags = [
        "elastic",
-        "flaky",
    ],
    deps = [
        ":elasticsearch",