Merge pull request #399 from deniszh/DZ-prep-0.15.6

deniszh · web-flow · commit f40cc16f666b · 2021-01-24T19:24:35.000+01:00
v0.15.6
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 ## Changelog
 ##### master
 
+##### version 0.15.6
+* trie/realtime: set wspConfigRetriever when realtime index is enabled #395 #396
+* Go v1.15.3
+
 ##### version 0.15.5
 * carbonserver: fix incorrect hanlding of counting and indexing files in updateFileList #385
 
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
-FROM golang:1.15.3-alpine3.12 AS build
+FROM golang:1.15.7-alpine3.12 AS build
 
-ARG gocarbon_version=0.15.5
+ARG gocarbon_version=0.15.6
 ARG gocarbon_repo=https://github.com/go-graphite/go-carbon.git
 RUN apk add --update git make \
  && git clone "${gocarbon_repo}" /usr/local/src/go-carbon \
diff --git a/go-carbon.go b/go-carbon.go
@@ -27,7 +27,7 @@ import (
 )
 
 // Version of go-carbon
-const Version = "0.15.5"
+const Version = "0.15.6"
 
 var BuildVersion = "(development version)"
 

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import (`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`// Version of go-carbon`
`30`		`-const Version = "0.15.5"`
	`30`	`+const Version = "0.15.6"`
`31`	`31`
`32`	`32`	`var BuildVersion = "(development version)"`
`33`	`33`