Merge pull request #1245 from andrewkroh/feature/go16

Update to Go 1.6
elastic · Mar 29, 2016 · 236f788 · 236f788
2 parents a5cd423 + e890d4f
commit 236f788
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 52 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -6,7 +6,7 @@ os: Windows Server 2012 R2
 
 # Environment variables
 environment:
-  GOROOT: c:\go1.5.3
+  GOROOT: c:\go1.6
   GOPATH: c:\gopath
   PYWIN_DL: https://downloads.sourceforge.net/project/pywin32/pywin32/Build%20219/pywin32-219.win32-py2.7.exe
   matrix:
@@ -24,13 +24,13 @@ clone_folder: c:\gopath\src\github.com\elastic\beats
 cache:
 - C:\ProgramData\chocolatey\bin -> .appveyor.yml
 - C:\ProgramData\chocolatey\lib -> .appveyor.yml
-- C:\go1.5.3 -> .appveyor.yml
+- C:\go1.6 -> .appveyor.yml
 - C:\tools\mingw64 -> .appveyor.yml
 - C:\pywin_inst.exe -> .appveyor.yml
 
 # Scripts that run after cloning repository
 install:
-  - ps: c:\gopath\src\github.com\elastic\beats\libbeat\scripts\install-go.ps1 -version 1.5.3
+  - ps: c:\gopath\src\github.com\elastic\beats\libbeat\scripts\install-go.ps1 -version 1.6
   - set PATH=%GOROOT%\bin;%PATH%
   # AppVeyor installed mingw is 32-bit only.
   - ps: >-

diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ services:
 language: go
 
 go:
-  - 1.5.3
+  - 1.6
 
 os:
   - linux

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -70,7 +70,7 @@ https://github.com/elastic/beats/compare/v1.1.2...master[Check the HEAD diff]
 ==== Added
 
 *Affecting all Beats*
-- Update builds to Golang version 1.5.3
+- Update builds to Golang version 1.6
 - Make logstash output compression level configurable. {pull}630[630]
 - Add ability to override configuration settings using environment variables {issue}114[114]
 - Libbeat now always exits through a single exit method for proper cleanup and control {pull}736[736]

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -51,7 +51,7 @@ Beats](https://github.com/elastic/beats/blob/master/libbeat/docs/communitybeats.
 
 The Beats are Go programs, so install the latest version of
 [golang](http://golang.org/) if you don't have it already. The current Go version
-used for development is Golang 1.5.3.
+used for development is Golang 1.6.
 
 The Beats are Go programs, so install the latest version of
 [golang](http://golang.org/) if you don't have it already.

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.5.3
+FROM golang:1.6
 MAINTAINER Nicolas Ruflin <[email protected]>
 
 RUN set -x && \

diff --git a/dev-tools/packer/.travis.yml b/dev-tools/packer/.travis.yml
diff --git a/libbeat/Dockerfile b/libbeat/Dockerfile
@@ -1,5 +1,5 @@
 # Beats dockerfile used for testing
-FROM golang:1.5.3
+FROM golang:1.6
 MAINTAINER Nicolas Ruflin <[email protected]>
 
 RUN set -x && \

diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.5.3
+FROM golang:1.6
 MAINTAINER Nicolas Ruflin <[email protected]>
 
 RUN set -x && \

diff --git a/packetbeat/Dockerfile b/packetbeat/Dockerfile
@@ -1,5 +1,5 @@
 # Beats dockerfile used for testing
-FROM golang:1.5.3
+FROM golang:1.6
 MAINTAINER Nicolas Ruflin <[email protected]>
 
 RUN set -x && \