From 42d8a13229614e7f2653f0ecc6e38e25031d55df Mon Sep 17 00:00:00 2001
From: Wojciech Tyczynski <wojtekt@google.com>
Date: Mon, 31 Oct 2016 08:34:33 +0100
Subject: [PATCH] Fix conflict in kubemark

---
 test/kubemark/start-kubemark-master.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/kubemark/start-kubemark-master.sh b/test/kubemark/start-kubemark-master.sh
index c71636e52b4..ba51d34e494 100644
--- a/test/kubemark/start-kubemark-master.sh
+++ b/test/kubemark/start-kubemark-master.sh
@@ -76,8 +76,8 @@ function mount-master-pd() {
 
 mount-master-pd
 
-ETCD_QUOTA_BYTES=
-if [ "${TEST_ETCD_VERSION:0:2}" == "3." ]; then
+ETCD_QUOTA_BYTES=""
+if [ "${KUBEMARK_ETCD_VERSION:0:2}" == "3." ]; then
   # TODO: Set larger quota to see if that helps with
   # 'mvcc: database space exceeded' errors. If so, pipe
   # though our setup scripts.