github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #35888 from wojtek-t/fix_kubemark_quota_bytes 

Automatic merge from submit-queue

Fix conflict in kubemark
pull/6/head
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
Show Stats 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 mount-master-pd
ETCD_QUOTA_BYTES= ETCD_QUOTA_BYTES=""
if [ "${TEST_ETCD_VERSION:0:2}" == "3." ]; then if [ "${KUBEMARK_ETCD_VERSION:0:2}" == "3." ]; then
# TODO: Set larger quota to see if that helps with # TODO: Set larger quota to see if that helps with
# 'mvcc: database space exceeded' errors. If so, pipe # 'mvcc: database space exceeded' errors. If so, pipe
# though our setup scripts. # though our setup scripts.