From e67dae51306525f27c9e83727f55fd2dea548531 Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Fri, 2 Sep 2016 16:09:47 -0700 Subject: [PATCH 1/2] Revert "Merge pull request #31930 from Kashomon/hazelcast" This reverts commit 26a0da8feed6620f34f2bbe47e5c5e024ed2507a, reversing changes made to c9fda51d779822cdc4b08e6c244a8f95f1a78308. --- test/e2e/examples.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/e2e/examples.go b/test/e2e/examples.go index ff8d2cb1ba9..21622f107ae 100644 --- a/test/e2e/examples.go +++ b/test/e2e/examples.go @@ -446,8 +446,6 @@ var _ = framework.KubeDescribe("[Feature:Example]", func() { framework.KubeDescribe("Hazelcast", func() { It("should create and scale hazelcast", func() { - framework.Skipf("Skipping because of upstream race condition. Remove Skip when https://github.com/pires/hazelcast-kubernetes-bootstrapper/issues/9 is fixed") - mkpath := func(file string) string { return filepath.Join(framework.TestContext.RepoRoot, "examples/storage/hazelcast", file) } From 4284381e746e1bcdf84db85b3401022e40b6bf32 Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Fri, 2 Sep 2016 16:11:25 -0700 Subject: [PATCH 2/2] bump hazelcast version --- examples/storage/hazelcast/README.md | 2 +- examples/storage/hazelcast/hazelcast-controller.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/storage/hazelcast/README.md b/examples/storage/hazelcast/README.md index ad7432948cc..c5876acf867 100644 --- a/examples/storage/hazelcast/README.md +++ b/examples/storage/hazelcast/README.md @@ -125,7 +125,7 @@ spec: - resources: limits: cpu: 0.1 - image: quay.io/pires/hazelcast-kubernetes:0.5 + image: quay.io/pires/hazelcast-kubernetes:0.6 name: hazelcast env: - name: "DNS_DOMAIN" diff --git a/examples/storage/hazelcast/hazelcast-controller.yaml b/examples/storage/hazelcast/hazelcast-controller.yaml index 34954d0a6b9..aeb46c14bd9 100644 --- a/examples/storage/hazelcast/hazelcast-controller.yaml +++ b/examples/storage/hazelcast/hazelcast-controller.yaml @@ -17,7 +17,7 @@ spec: - resources: limits: cpu: 0.1 - image: quay.io/pires/hazelcast-kubernetes:0.5 + image: quay.io/pires/hazelcast-kubernetes:0.6 name: hazelcast env: - name: "DNS_DOMAIN"