diff options
| -rw-r--r-- | k8s/helm_charts2/Chart.yaml | 4 | ||||
| -rw-r--r-- | weed/iamapi/iamapi_management_handlers.go | 5 | ||||
| -rw-r--r-- | weed/util/constants.go | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/k8s/helm_charts2/Chart.yaml b/k8s/helm_charts2/Chart.yaml index fe46c50a1..2ce8c3db9 100644 --- a/k8s/helm_charts2/Chart.yaml +++ b/k8s/helm_charts2/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 description: SeaweedFS name: seaweedfs -appVersion: "3.14" -version: "3.14" +appVersion: "3.15" +version: "3.15" diff --git a/weed/iamapi/iamapi_management_handlers.go b/weed/iamapi/iamapi_management_handlers.go index fdd943b28..d3b1e7b28 100644 --- a/weed/iamapi/iamapi_management_handlers.go +++ b/weed/iamapi/iamapi_management_handlers.go @@ -419,14 +419,11 @@ func (iama *IamApiServer) DoActions(w http.ResponseWriter, r *http.Request) { return } values := r.PostForm - var s3cfgLock sync.RWMutex - s3cfgLock.RLock() s3cfg := &iam_pb.S3ApiConfiguration{} if err := iama.s3ApiConfig.GetS3ApiConfiguration(s3cfg); err != nil { s3err.WriteErrorResponse(w, r, s3err.ErrInternalError) return } - s3cfgLock.RUnlock() glog.V(4).Infof("DoActions: %+v", values) var response interface{} @@ -505,9 +502,7 @@ func (iama *IamApiServer) DoActions(w http.ResponseWriter, r *http.Request) { return } if changed { - s3cfgLock.Lock() err := iama.s3ApiConfig.PutS3ApiConfiguration(s3cfg) - s3cfgLock.Unlock() if err != nil { writeIamErrorResponse(w, r, fmt.Errorf(iam.ErrCodeServiceFailureException), "", "", err) return diff --git a/weed/util/constants.go b/weed/util/constants.go index 7448fad62..8438624bf 100644 --- a/weed/util/constants.go +++ b/weed/util/constants.go @@ -5,7 +5,7 @@ import ( ) var ( - VERSION_NUMBER = fmt.Sprintf("%.02f", 3.14) + VERSION_NUMBER = fmt.Sprintf("%.02f", 3.15) VERSION = sizeLimit + " " + VERSION_NUMBER COMMIT = "" ) |