aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2020-12-13 04:08:36 -0800
committerChris Lu <chris.lu@gmail.com>2020-12-13 04:08:36 -0800
commit66cd219b152851a7fd6c2cc39a32a7be776b90af (patch)
treec518f0547d6dc16c4ba31007becbf335e955bbaa
parent17372ac3da566d303982470724a24b67a2815a8f (diff)
parent813453f3e1d6b6939aaee3d94b4491c928b2d2fb (diff)
downloadseaweedfs-66cd219b152851a7fd6c2cc39a32a7be776b90af.tar.xz
seaweedfs-66cd219b152851a7fd6c2cc39a32a7be776b90af.zip
Merge branch 'master' into support_ssd_volume
-rw-r--r--k8s/seaweedfs/values.yaml2
-rw-r--r--weed/util/constants.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/k8s/seaweedfs/values.yaml b/k8s/seaweedfs/values.yaml
index bba99cdb3..72bdb684a 100644
--- a/k8s/seaweedfs/values.yaml
+++ b/k8s/seaweedfs/values.yaml
@@ -4,7 +4,7 @@ global:
registry: ""
repository: ""
imageName: chrislusf/seaweedfs
- imageTag: "2.14"
+ imageTag: "2.15"
imagePullPolicy: IfNotPresent
imagePullSecrets: imagepullsecret
restartPolicy: Always
diff --git a/weed/util/constants.go b/weed/util/constants.go
index ebf9e0ea9..52ba08494 100644
--- a/weed/util/constants.go
+++ b/weed/util/constants.go
@@ -5,7 +5,7 @@ import (
)
var (
- VERSION = fmt.Sprintf("%s %d.%02d", sizeLimit, 2, 14)
+ VERSION = fmt.Sprintf("%s %d.%02d", sizeLimit, 2, 15)
COMMIT = ""
)