summaryrefslogtreecommitdiff
path: root/development.md
diff options
context:
space:
mode:
authork8s-merge-robot <k8s.production.user@gmail.com>2016-04-05 13:26:18 -0700
committerk8s-merge-robot <k8s.production.user@gmail.com>2016-04-05 13:26:18 -0700
commitb8eef418b486850a4351f739fdb6868e7501e33b (patch)
tree4f51bf0cefa45ccf37e57520ab81c5dbce4661d7 /development.md
parent547328cff3aff9cb9348f2d0d1d4882685a5461c (diff)
parentfcf9b3c9433d96a423b7d5aaa6f573e86869702c (diff)
Merge pull request #22149 from luxas/onedotsix
Automatic merge from submit-queue Up to golang 1.6 A second attempt to upgrade go version above `go1.4` Merge ASAP after you've cut the `release-1.2` branch and feel ready. `go1.6` should perform slightly better than `go1.5`, so this time it might work @gmarek @wojtek-t @zmerlynn @mikedanese @brendandburns @ixdy @thockin
Diffstat (limited to 'development.md')
-rw-r--r--development.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/development.md b/development.md
index a45b3ab1..41179f57 100644
--- a/development.md
+++ b/development.md
@@ -54,7 +54,7 @@ Kubernetes is written in the [Go](http://golang.org) programming language. If yo
### Go versions
-Requires Go version 1.4.x or 1.5.x
+Requires Go version 1.4.x, 1.5.x or 1.6.x
## Git setup