Merge pull request #35888 from wojtek-t/fix_kubemark_quota_bytes

Automatic merge from submit-queue Fix conflict in kubemark

Merge pull request #35888 from wojtek-t/fix_kubemark_quota_bytes
b7fef610 · Kubernetes Submit Queue · GitHub · e4b41dd2 · 42d8a132 · b7fef610
Commit b7fef610 authored Oct 31, 2016 by Kubernetes Submit Queue Committed by GitHub Oct 31, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

start-kubemark-master.sh test/kubemark/start-kubemark-master.sh +2 -2

No files found.
--- 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.