scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-02 19:28:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35888 from wojtek-t/fix_kubemark_quota_bytes

Browse Source 
Automatic merge from submit-queue

Fix conflict in kubemark
This commit is contained in:
Kubernetes Submit Queue
2016-10-31 03:31:35 -07:00
committed by GitHub
parent e4b41dd292 42d8a13229
commit b7fef610cd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/kubemark/start-kubemark-master.sh
View File

@@ -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.