From a53f538f272de9b4b59cfb6f677a6d667aa9dc51 Mon Sep 17 00:00:00 2001 From: Gyu-Ho Lee Date: Fri, 1 Jul 2016 11:13:22 -0700 Subject: [PATCH] *: test, docs with go1.6+ etcd v3 uses http/2, which doesn't work well with go1.5 --- .travis.yml | 5 ----- Documentation/dl_build.md | 2 +- README.md | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index b8125b2c195..e3be66779b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ go_import_path: github.com/coreos/etcd sudo: false go: - - 1.5 - 1.6 - tip @@ -22,10 +21,6 @@ matrix: allow_failures: - go: tip exclude: - - go: 1.5 - env: TARGET=arm - - go: 1.5 - env: TARGET=ppc64le - go: 1.6 env: TARGET=arm64 - go: tip diff --git a/Documentation/dl_build.md b/Documentation/dl_build.md index 9b5520f9e1b..14ac4fd2451 100644 --- a/Documentation/dl_build.md +++ b/Documentation/dl_build.md @@ -11,7 +11,7 @@ The easiest way to get etcd is to use one of the pre-built release binaries whic ## Build the latest version For those wanting to try the very latest version, build etcd from the `master` branch. -[Go](https://golang.org/) version 1.5+ is required to build the latest version of etcd. +[Go](https://golang.org/) version 1.6+ (with HTTP2 support) is required to build the latest version of etcd. Here are the commands to build an etcd binary from the `master` branch: diff --git a/README.md b/README.md index 1f59c4645e4..30c16d9bfe5 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ See [etcdctl][etcdctl] for a simple command line client. The easiest way to get etcd is to use one of the pre-built release binaries which are available for OSX, Linux, Windows, AppC (ACI), and Docker. Instructions for using these binaries are on the [GitHub releases page][github-release]. For those wanting to try the very latest version, you can build the latest version of etcd from the `master` branch. -You will first need [*Go*](https://golang.org/) installed on your machine (version 1.5+ is required). +You will first need [*Go*](https://golang.org/) installed on your machine (version 1.6+ is required). All development occurs on `master`, including new features and bug fixes. Bug fixes are first targeted at `master` and subsequently ported to release branches, as described in the [branch management][branch-management] guide.