Merge 782e413 into 366d57a

atlassian · Dec 15, 2020 · a29e06f · a29e06f
2 parents 366d57a + 782e413
commit a29e06f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ services:
   - docker
 
 go:
-  - "1.13.6"  # Keep in sync with Makefile and README.md
+  - "1.15.6"  # Keep in sync with Makefile and README.md
 
 arch:
   - amd64

diff --git a/Makefile b/Makefile
@@ -12,7 +12,7 @@ CPU_ARCH ?= amd64
 MANIFEST_NAME := atlassianlabs/$(BINARY_NAME)
 IMAGE_NAME := $(MANIFEST_NAME)-$(CPU_ARCH)
 ARCH ?= $$(uname -s | tr A-Z a-z)
-GOVERSION := 1.13.6  # Keep in sync with .travis.yml and README.md
+GOVERSION := 1.15.6  # Keep in sync with .travis.yml and README.md
 GP := /gopath
 MAIN_PKG := github.com/atlassian/gostatsd/cmd/gostatsd
 CLUSTER_PKG := github.com/atlassian/gostatsd/cmd/cluster

diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ server based on load.
 
 Building the server
 -------------------
-Gostatsd currently targets Go 1.13.6.  If you are compiling from source, please ensure you are running this version.
+Gostatsd currently targets Go 1.15.6.  If you are compiling from source, please ensure you are running this version.
 
 From the `gostatsd` directory run `make build`. The binary will be built in `build/bin/<arch>/gostatsd`.